Browse Source

made sure frozensimulation stays frozen when doing setOptions or the like

v3_develop
Alex de Mulder 9 years ago
parent
commit
f91e2bfab6
4 changed files with 6936 additions and 6939 deletions
  1. +6931
    -6933
      dist/vis.js
  2. +1
    -1
      dist/vis.map
  3. +1
    -1
      dist/vis.min.css
  4. +3
    -4
      lib/network/Network.js

+ 6931
- 6933
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


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


+ 3
- 4
lib/network/Network.js View File

@ -945,10 +945,6 @@ Network.prototype._createKeyBinds = function() {
this.keycharm.bind("pagedown",this._zoomOut.bind(me),"keydown"); this.keycharm.bind("pagedown",this._zoomOut.bind(me),"keydown");
this.keycharm.bind("pagedown",this._stopZoom.bind(me), "keyup"); this.keycharm.bind("pagedown",this._stopZoom.bind(me), "keyup");
} }
//this.keycharm.bind("1",this.increaseClusterLevel.bind(me), "keydown");
//this.keycharm.bind("2",this.decreaseClusterLevel.bind(me), "keydown");
//this.keycharm.bind("3",this.forceAggregateHubs.bind(me,true),"keydown");
//this.keycharm.bind("4",this.normalizeClusterLevels.bind(me), "keydown");
if (this.constants.dataManipulation.enabled == true) { if (this.constants.dataManipulation.enabled == true) {
this.keycharm.bind("esc",this._createManipulatorBar.bind(me)); this.keycharm.bind("esc",this._createManipulatorBar.bind(me));
@ -2418,6 +2414,9 @@ if (typeof window !== 'undefined') {
* Schedule a animation step with the refreshrate interval. * Schedule a animation step with the refreshrate interval.
*/ */
Network.prototype.start = function() { Network.prototype.start = function() {
if (this.freezeSimulationEnabled == true) {
this.moving = false;
}
if (this.moving == true || this.xIncrement != 0 || this.yIncrement != 0 || this.zoomIncrement != 0 || this.animating == true) { if (this.moving == true || this.xIncrement != 0 || this.yIncrement != 0 || this.zoomIncrement != 0 || this.animating == true) {
if (!this.timer) { if (!this.timer) {
if (this.requiresTimeout == true) { if (this.requiresTimeout == true) {

Loading…
Cancel
Save