Browse Source

- Close active sessions in dataManipulation when calling setData().

v3_develop
Alex de Mulder 10 years ago
parent
commit
b75a8ec09e
6 changed files with 27022 additions and 27007 deletions
  1. +1
    -0
      HISTORY.md
  2. +26999
    -26992
      dist/vis.js
  3. +1
    -1
      dist/vis.map
  4. +14
    -14
      dist/vis.min.js
  5. +6
    -0
      lib/network/Network.js
  6. +1
    -0
      lib/network/mixins/ManipulationMixin.js

+ 1
- 0
HISTORY.md View File

@ -19,6 +19,7 @@ http://visjs.org
- Fixed issue #564 by resetting state to initial when no callback is performed in the return function. - Fixed issue #564 by resetting state to initial when no callback is performed in the return function.
- Added condition to Repulsion similar to BarnesHut to ensure nodes do not overlap. - Added condition to Repulsion similar to BarnesHut to ensure nodes do not overlap.
- Added labelAlignment option to edges. Thanks @T-rav! - Added labelAlignment option to edges. Thanks @T-rav!
- Close active sessions in dataManipulation when calling setData().
### Timeline ### Timeline

+ 26999
- 26992
dist/vis.js
File diff suppressed because it is too large
View File


+ 1
- 1
dist/vis.map
File diff suppressed because it is too large
View File


+ 14
- 14
dist/vis.min.js
File diff suppressed because it is too large
View File


+ 6
- 0
lib/network/Network.js View File

@ -549,6 +549,11 @@ Network.prototype.setData = function(data, disableStart) {
' parameter pair "nodes" and "edges", but not both.'); ' parameter pair "nodes" and "edges", but not both.');
} }
// clean up in case there is anyone in an active mode of the manipulation. This is the same option as bound to the escape button.
if (this.constants.dataManipulation.enabled == true) {
this._createManipulatorBar();
}
// set options // set options
this.setOptions(data && data.options); this.setOptions(data && data.options);
// set all data // set all data
@ -714,6 +719,7 @@ Network.prototype.setOptions = function (options) {
throw new Error('Option "labels" is deprecated. Use options "locale" and "locales" instead.'); throw new Error('Option "labels" is deprecated. Use options "locale" and "locales" instead.');
} }
// (Re)loading the mixins that can be enabled or disabled in the options. // (Re)loading the mixins that can be enabled or disabled in the options.
// load the force calculation functions, grouped under the physics system. // load the force calculation functions, grouped under the physics system.
this._loadPhysicsSystem(); this._loadPhysicsSystem();

+ 1
- 0
lib/network/mixins/ManipulationMixin.js View File

@ -15,6 +15,7 @@ exports._clearManipulatorBar = function() {
delete this.sectors['support']['nodes']['targetNode']; delete this.sectors['support']['nodes']['targetNode'];
delete this.sectors['support']['nodes']['targetViaNode']; delete this.sectors['support']['nodes']['targetViaNode'];
this.controlNodesActive = false; this.controlNodesActive = false;
this.freezeSimulation = false;
}; };
/** /**

Loading…
Cancel
Save