diff --git a/dist/vis.js b/dist/vis.js index a8095a0e..bd766b4f 100644 --- a/dist/vis.js +++ b/dist/vis.js @@ -14920,13 +14920,11 @@ var SelectionMixin = { var node = this._getNodeAt(pointer); if (node != null) { this._selectObject(node,false); - this.emit("clickNode", this.getSelection()); } else { var edge = this._getEdgeAt(pointer); if (edge != null) { this._selectObject(edge,false); - this.emit("clickEdge", this.getSelection()); } else { this._unselectAll(); @@ -14945,20 +14943,13 @@ var SelectionMixin = { */ _handleDoubleTap : function(pointer) { var node = this._getNodeAt(pointer); - var selection = this.getSelection(); if (node != null && node !== undefined) { // we reset the areaCenter here so the opening of the node will occur this.areaCenter = {"x" : this._canvasToX(pointer.x), "y" : this._canvasToY(pointer.y)}; this.openCluster(node); - this.emit("doubleClickNode", selection); } - else { - if (this._getSelectedEdgeCount() == 1) { - this.emit("doubleClickEdge", selection); - } - } - this.emit("doubleClick", selection); + this.emit("doubleClick", this.getSelection()); }, diff --git a/docs/graph.html b/docs/graph.html index e8d4e4ba..e95f855c 100644 --- a/docs/graph.html +++ b/docs/graph.html @@ -1871,26 +1871,6 @@ graph.off('select', onSelect); - - clickNode - Fired after the user clicks on a node or taps a node on a touchscreen. - - - - - - clickEdge - Fired after the user clicks on an edge or taps an edge on a touchscreen. - - - - doubleClick Fired after the user double clicks or double taps on a touchscreen. @@ -1901,26 +1881,6 @@ graph.off('select', onSelect); - - doubleClickEdge - Fired after the user double clicks on an edge or double taps an edge on a touchscreen. - - - - - - doubleClickNode - Fired after the user double clicks on a node or double taps a node on a touchscreen. - - - - frameResize Fired when the size of the canvas has been updated (not neccecarily changed) by the setSize() function or by the setOptions() function. diff --git a/src/graph/graphMixins/SelectionMixin.js b/src/graph/graphMixins/SelectionMixin.js index bdb3ffb0..194a99ae 100644 --- a/src/graph/graphMixins/SelectionMixin.js +++ b/src/graph/graphMixins/SelectionMixin.js @@ -392,13 +392,11 @@ var SelectionMixin = { var node = this._getNodeAt(pointer); if (node != null) { this._selectObject(node,false); - this.emit("clickNode", this.getSelection()); } else { var edge = this._getEdgeAt(pointer); if (edge != null) { this._selectObject(edge,false); - this.emit("clickEdge", this.getSelection()); } else { this._unselectAll(); @@ -417,20 +415,13 @@ var SelectionMixin = { */ _handleDoubleTap : function(pointer) { var node = this._getNodeAt(pointer); - var selection = this.getSelection(); if (node != null && node !== undefined) { // we reset the areaCenter here so the opening of the node will occur this.areaCenter = {"x" : this._canvasToX(pointer.x), "y" : this._canvasToY(pointer.y)}; this.openCluster(node); - this.emit("doubleClickNode", selection); } - else { - if (this._getSelectedEdgeCount() == 1) { - this.emit("doubleClickEdge", selection); - } - } - this.emit("doubleClick", selection); + this.emit("doubleClick", this.getSelection()); },