Browse Source

Reverted patch that made nodes return to 'default' setting if no group was assigned to fix issue #561

v3_develop
Alex de Mulder 10 years ago
parent
commit
da632446f6
2 changed files with 2 additions and 5 deletions
  1. +2
    -2
      dist/vis.js
  2. +0
    -3
      lib/network/Node.js

+ 2
- 2
dist/vis.js View File

@ -5,7 +5,7 @@
* A dynamic, browser-based visualization library. * A dynamic, browser-based visualization library.
* *
* @version 3.8.1-SNAPSHOT * @version 3.8.1-SNAPSHOT
* @date 2015-01-13
* @date 2015-01-14
* *
* @license * @license
* Copyright (C) 2011-2014 Almende B.V, http://almende.com * Copyright (C) 2011-2014 Almende B.V, http://almende.com
@ -26639,7 +26639,7 @@ return /******/ (function(modules) { // webpackBootstrap
this.options.color = util.parseColor(this.options.color); this.options.color = util.parseColor(this.options.color);
} }
else if (properties.color === undefined) { else if (properties.color === undefined) {
this.options.color = constants.nodes.color;
//this.options.color = constants.nodes.color;
} }
// individual shape properties // individual shape properties

+ 0
- 3
lib/network/Node.js View File

@ -186,9 +186,6 @@ Node.prototype.setProperties = function(properties, constants) {
// the color object needs to be completely defined. Since groups can partially overwrite the colors, we parse it again, just in case. // the color object needs to be completely defined. Since groups can partially overwrite the colors, we parse it again, just in case.
this.options.color = util.parseColor(this.options.color); this.options.color = util.parseColor(this.options.color);
} }
else if (properties.color === undefined) {
this.options.color = constants.nodes.color;
}
// individual shape properties // individual shape properties
if (properties.radius !== undefined) {this.baseRadiusValue = this.options.radius;} if (properties.radius !== undefined) {this.baseRadiusValue = this.options.radius;}

Loading…
Cancel
Save