|
@ -318,7 +318,7 @@ class InteractionHandler { |
|
|
} |
|
|
} |
|
|
else { |
|
|
else { |
|
|
// fallback if no node is selected and thus the view is dragged.
|
|
|
// fallback if no node is selected and thus the view is dragged.
|
|
|
this.selectionHandler._generateClickEvent('dragStart', event, this.drag.pointer); |
|
|
|
|
|
|
|
|
this.selectionHandler._generateClickEvent('dragStart', event, this.drag.pointer, undefined, true); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -337,10 +337,10 @@ class InteractionHandler { |
|
|
|
|
|
|
|
|
let pointer = this.getPointer(event.center); |
|
|
let pointer = this.getPointer(event.center); |
|
|
|
|
|
|
|
|
this.selectionHandler._generateClickEvent('dragging', event, pointer); |
|
|
|
|
|
|
|
|
|
|
|
let selection = this.drag.selection; |
|
|
let selection = this.drag.selection; |
|
|
if (selection && selection.length && this.options.dragNodes === true) { |
|
|
if (selection && selection.length && this.options.dragNodes === true) { |
|
|
|
|
|
this.selectionHandler._generateClickEvent('dragging', event, pointer); |
|
|
|
|
|
|
|
|
// calculate delta's and new location
|
|
|
// calculate delta's and new location
|
|
|
let deltaX = pointer.x - this.drag.pointer.x; |
|
|
let deltaX = pointer.x - this.drag.pointer.x; |
|
|
let deltaY = pointer.y - this.drag.pointer.y; |
|
|
let deltaY = pointer.y - this.drag.pointer.y; |
|
@ -364,6 +364,8 @@ class InteractionHandler { |
|
|
else { |
|
|
else { |
|
|
// move the network
|
|
|
// move the network
|
|
|
if (this.options.dragView === true) { |
|
|
if (this.options.dragView === true) { |
|
|
|
|
|
this.selectionHandler._generateClickEvent('dragging', event, pointer, undefined, true); |
|
|
|
|
|
|
|
|
// if the drag was not started properly because the click started outside the network div, start it now.
|
|
|
// if the drag was not started properly because the click started outside the network div, start it now.
|
|
|
if (this.drag.pointer === undefined) { |
|
|
if (this.drag.pointer === undefined) { |
|
|
this._handleDragStart(event); |
|
|
this._handleDragStart(event); |
|
@ -387,6 +389,7 @@ class InteractionHandler { |
|
|
this.drag.dragging = false; |
|
|
this.drag.dragging = false; |
|
|
let selection = this.drag.selection; |
|
|
let selection = this.drag.selection; |
|
|
if (selection && selection.length) { |
|
|
if (selection && selection.length) { |
|
|
|
|
|
this.selectionHandler._generateClickEvent('dragEnd', event, this.getPointer(event.center)); |
|
|
selection.forEach(function (s) { |
|
|
selection.forEach(function (s) { |
|
|
// restore original xFixed and yFixed
|
|
|
// restore original xFixed and yFixed
|
|
|
s.node.options.fixed.x = s.xFixed; |
|
|
s.node.options.fixed.x = s.xFixed; |
|
@ -395,9 +398,9 @@ class InteractionHandler { |
|
|
this.body.emitter.emit('startSimulation'); |
|
|
this.body.emitter.emit('startSimulation'); |
|
|
} |
|
|
} |
|
|
else { |
|
|
else { |
|
|
|
|
|
this.selectionHandler._generateClickEvent('dragEnd', event, this.getPointer(event.center), undefined, true); |
|
|
this.body.emitter.emit('_requestRedraw'); |
|
|
this.body.emitter.emit('_requestRedraw'); |
|
|
} |
|
|
} |
|
|
this.selectionHandler._generateClickEvent('dragEnd', event, this.getPointer(event.center)); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|