Browse Source

fixed #235

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

+ 5
- 5
dist/vis.js View File

@ -5,7 +5,7 @@
* A dynamic, browser-based visualization library. * A dynamic, browser-based visualization library.
* *
* @version 3.1.1-SNAPSHOT * @version 3.1.1-SNAPSHOT
* @date 2014-07-24
* @date 2014-08-13
* *
* @license * @license
* Copyright (C) 2011-2014 Almende B.V, http://almende.com * Copyright (C) 2011-2014 Almende B.V, http://almende.com
@ -15353,11 +15353,11 @@ return /******/ (function(modules) { // webpackBootstrap
if (content instanceof Element) { if (content instanceof Element) {
this.dom.inner.appendChild(content); this.dom.inner.appendChild(content);
} }
else if (content != undefined) {
else if (content !== undefined && content !== null) {
this.dom.inner.innerHTML = content; this.dom.inner.innerHTML = content;
} }
else { else {
this.dom.inner.innerHTML = this.groupId;
this.dom.inner.innerHTML = this.groupId || ''; // groupId can be null
} }
// update title // update title
@ -19731,7 +19731,7 @@ return /******/ (function(modules) { // webpackBootstrap
} }
} }
} }
console.log(this.triggerFunctions)
if (options.onAdd) {this.triggerFunctions.add = options.onAdd;} if (options.onAdd) {this.triggerFunctions.add = options.onAdd;}
if (options.onEdit) {this.triggerFunctions.edit = options.onEdit;} if (options.onEdit) {this.triggerFunctions.edit = options.onEdit;}
if (options.onEditEdge) {this.triggerFunctions.editEdge = options.onEditEdge;} if (options.onEditEdge) {this.triggerFunctions.editEdge = options.onEditEdge;}
@ -25213,7 +25213,7 @@ return /******/ (function(modules) { // webpackBootstrap
}; };
Edge.prototype.positionBezierNode = function() { Edge.prototype.positionBezierNode = function() {
if (this.via !== null) {
if (this.via !== null && this.from !== null && this.to !== null) {
this.via.x = 0.5 * (this.from.x + this.to.x); this.via.x = 0.5 * (this.from.x + this.to.x);
this.via.y = 0.5 * (this.from.y + this.to.y); this.via.y = 0.5 * (this.from.y + this.to.y);
} }

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

@ -1006,7 +1006,7 @@ Edge.prototype.unselect = function() {
}; };
Edge.prototype.positionBezierNode = function() { Edge.prototype.positionBezierNode = function() {
if (this.via !== null) {
if (this.via !== null && this.from !== null && this.to !== null) {
this.via.x = 0.5 * (this.from.x + this.to.x); this.via.x = 0.5 * (this.from.x + this.to.x);
this.via.y = 0.5 * (this.from.y + this.to.y); this.via.y = 0.5 * (this.from.y + this.to.y);
} }

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

@ -588,7 +588,7 @@ Network.prototype.setOptions = function (options) {
} }
} }
} }
console.log(this.triggerFunctions)
if (options.onAdd) {this.triggerFunctions.add = options.onAdd;} if (options.onAdd) {this.triggerFunctions.add = options.onAdd;}
if (options.onEdit) {this.triggerFunctions.edit = options.onEdit;} if (options.onEdit) {this.triggerFunctions.edit = options.onEdit;}
if (options.onEditEdge) {this.triggerFunctions.editEdge = options.onEditEdge;} if (options.onEditEdge) {this.triggerFunctions.editEdge = options.onEditEdge;}

Loading…
Cancel
Save