Browse Source

Merge pull request #1073 from sc8696/master

Missed "apply" call on DOMtoCanvas method
flowchartTest
Alex 9 years ago
parent
commit
7053fda503
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      HISTORY.md
  2. +2
    -2
      lib/network/Network.js

+ 1
- 1
HISTORY.md View File

@ -18,7 +18,7 @@ http://visjs.org
- Fixed #970: Implemented options `dataColor`, `axisColor`, and `gridColor`. - Fixed #970: Implemented options `dataColor`, `axisColor`, and `gridColor`.
### Network
### Network
- Fixed Hammerjs direction issue. - Fixed Hammerjs direction issue.
- Fixed recursion error when node is fixed but has no position. - Fixed recursion error when node is fixed but has no position.

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

@ -425,7 +425,7 @@ Network.prototype.isActive = function () {
Network.prototype.setSize = function() {return this.canvas.setSize.apply(this.canvas,arguments);}; Network.prototype.setSize = function() {return this.canvas.setSize.apply(this.canvas,arguments);};
Network.prototype.canvasToDOM = function() {return this.canvas.canvasToDOM.apply(this.canvas,arguments);}; Network.prototype.canvasToDOM = function() {return this.canvas.canvasToDOM.apply(this.canvas,arguments);};
Network.prototype.DOMtoCanvas = function() {return this.canvas.DOMtoCanvas(this.canvas,arguments);};
Network.prototype.DOMtoCanvas = function() {return this.canvas.DOMtoCanvas.apply(this.canvas,arguments);};
Network.prototype.findNode = function() {return this.clustering.findNode.apply(this.clustering,arguments);}; Network.prototype.findNode = function() {return this.clustering.findNode.apply(this.clustering,arguments);};
Network.prototype.isCluster = function() {return this.clustering.isCluster.apply(this.clustering,arguments);}; Network.prototype.isCluster = function() {return this.clustering.isCluster.apply(this.clustering,arguments);};
Network.prototype.openCluster = function() {return this.clustering.openCluster.apply(this.clustering,arguments);}; Network.prototype.openCluster = function() {return this.clustering.openCluster.apply(this.clustering,arguments);};
@ -493,4 +493,4 @@ Network.prototype.getOptionsFromConfigurator = function() {
return options; return options;
}; };
module.exports = Network;
module.exports = Network;

Loading…
Cancel
Save