Browse Source

Merge remote-tracking branch 'origin/develop' into develop

v3_develop
jos 10 years ago
parent
commit
01ccf1281c
3 changed files with 26666 additions and 2 deletions
  1. +26664
    -0
      dist/vis-light.js
  2. +1
    -1
      dist/vis.js
  3. +1
    -1
      lib/network/Node.js

+ 26664
- 0
dist/vis-light.js
File diff suppressed because it is too large
View File


+ 1
- 1
dist/vis.js View File

@ -18489,7 +18489,7 @@ return /******/ (function(modules) { // webpackBootstrap
}
// copy group properties
if (this.group !== undefined) {
if (this.group !== undefined && this.group != "") {
var groupObj = this.grouplist.get(this.group);
for (var prop in groupObj) {
if (groupObj.hasOwnProperty(prop)) {

+ 1
- 1
lib/network/Node.js View File

@ -171,7 +171,7 @@ Node.prototype.setProperties = function(properties, constants) {
}
// copy group properties
if (this.group !== undefined) {
if (this.group !== undefined && this.group != "") {
var groupObj = this.grouplist.get(this.group);
for (var prop in groupObj) {
if (groupObj.hasOwnProperty(prop)) {

Loading…
Cancel
Save