Browse Source

fixed drag when zooming per #214

v3_develop
Alex de Mulder 9 years ago
parent
commit
50e6e43367
3 changed files with 41 additions and 10 deletions
  1. +1
    -0
      HISTORY.md
  2. +20
    -5
      dist/vis.js
  3. +20
    -5
      lib/network/Network.js

+ 1
- 0
HISTORY.md View File

@ -25,6 +25,7 @@ http://visjs.org
- Fixed dot radius bug.
- Updated max velocity of nodes to three times it's original value.
- Made "stabilized" event fire every time the network stabilizes.
- Fixed drift in dragging nodes while zooming.

+ 20
- 5
dist/vis.js View File

@ -20105,13 +20105,13 @@ return /******/ (function(modules) { // webpackBootstrap
var pointer = this._getPointer(event.gesture.center);
var me = this,
drag = this.drag,
selection = drag.selection;
var me = this;
var drag = this.drag;
var selection = drag.selection;
if (selection && selection.length && this.constants.dragNodes == true) {
// calculate delta's and new location
var deltaX = pointer.x - drag.pointer.x,
deltaY = pointer.y - drag.pointer.y;
var deltaX = pointer.x - drag.pointer.x;
var deltaY = pointer.y - drag.pointer.y;
// update position of all selected nodes
selection.forEach(function (s) {
@ -20126,6 +20126,7 @@ return /******/ (function(modules) { // webpackBootstrap
}
});
// start _animationStep if not yet running
if (!this.moving) {
this.moving = true;
@ -20242,6 +20243,13 @@ return /******/ (function(modules) { // webpackBootstrap
if (scale > 10) {
scale = 10;
}
var preScaleDragPointer = null;
if (this.drag !== undefined) {
if (this.drag.dragging == true) {
preScaleDragPointer = this.DOMtoCanvas(this.drag.pointer);
}
}
// + this.frame.canvas.clientHeight / 2
var translation = this._getTranslation();
@ -20255,6 +20263,13 @@ return /******/ (function(modules) { // webpackBootstrap
this._setScale(scale);
this._setTranslation(tx, ty);
this.updateClustersDefault();
if (preScaleDragPointer != null) {
var postScaleDragPointer = this.canvasToDOM(preScaleDragPointer);
this.drag.pointer.x = postScaleDragPointer.x;
this.drag.pointer.y = postScaleDragPointer.y;
}
this._redraw();
if (scaleOld < scale) {

+ 20
- 5
lib/network/Network.js View File

@ -1010,13 +1010,13 @@ Network.prototype._handleOnDrag = function(event) {
var pointer = this._getPointer(event.gesture.center);
var me = this,
drag = this.drag,
selection = drag.selection;
var me = this;
var drag = this.drag;
var selection = drag.selection;
if (selection && selection.length && this.constants.dragNodes == true) {
// calculate delta's and new location
var deltaX = pointer.x - drag.pointer.x,
deltaY = pointer.y - drag.pointer.y;
var deltaX = pointer.x - drag.pointer.x;
var deltaY = pointer.y - drag.pointer.y;
// update position of all selected nodes
selection.forEach(function (s) {
@ -1031,6 +1031,7 @@ Network.prototype._handleOnDrag = function(event) {
}
});
// start _animationStep if not yet running
if (!this.moving) {
this.moving = true;
@ -1147,6 +1148,13 @@ Network.prototype._zoom = function(scale, pointer) {
if (scale > 10) {
scale = 10;
}
var preScaleDragPointer = null;
if (this.drag !== undefined) {
if (this.drag.dragging == true) {
preScaleDragPointer = this.DOMtoCanvas(this.drag.pointer);
}
}
// + this.frame.canvas.clientHeight / 2
var translation = this._getTranslation();
@ -1160,6 +1168,13 @@ Network.prototype._zoom = function(scale, pointer) {
this._setScale(scale);
this._setTranslation(tx, ty);
this.updateClustersDefault();
if (preScaleDragPointer != null) {
var postScaleDragPointer = this.canvasToDOM(preScaleDragPointer);
this.drag.pointer.x = postScaleDragPointer.x;
this.drag.pointer.y = postScaleDragPointer.y;
}
this._redraw();
if (scaleOld < scale) {

Loading…
Cancel
Save