From da632446f65a4f7c894d40f93fe709b04009477c Mon Sep 17 00:00:00 2001 From: Alex de Mulder Date: Wed, 14 Jan 2015 10:49:04 +0100 Subject: [PATCH] Reverted patch that made nodes return to 'default' setting if no group was assigned to fix issue #561 --- dist/vis.js | 4 ++-- lib/network/Node.js | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dist/vis.js b/dist/vis.js index 137991dc..1e6cfe83 100644 --- a/dist/vis.js +++ b/dist/vis.js @@ -5,7 +5,7 @@ * A dynamic, browser-based visualization library. * * @version 3.8.1-SNAPSHOT - * @date 2015-01-13 + * @date 2015-01-14 * * @license * 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); } else if (properties.color === undefined) { - this.options.color = constants.nodes.color; + //this.options.color = constants.nodes.color; } // individual shape properties diff --git a/lib/network/Node.js b/lib/network/Node.js index 51458d7b..bda23271 100644 --- a/lib/network/Node.js +++ b/lib/network/Node.js @@ -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. this.options.color = util.parseColor(this.options.color); } - else if (properties.color === undefined) { - this.options.color = constants.nodes.color; - } // individual shape properties if (properties.radius !== undefined) {this.baseRadiusValue = this.options.radius;}