Merge remote-tracking branch 'origin/develop' into develop

examples/network/events/interactionEvents.html

@@ -80,8 +80,8 @@
     network.on("showPopup", function (params) {
         document.getElementById('eventSpan').innerHTML = '<h2>showPopup event: </h2>' + JSON.stringify(params, null, 4);
     });
-    network.on("hidePopup", function (params) {
-        console.log('hidePopup Event:', params);
+    network.on("hidePopup", function () {
+        console.log('hidePopup Event');
     });
     network.on("select", function (params) {
         console.log('select Event:', params);

lib/network/modules/InteractionHandler.js

@@ -190,7 +190,7 @@ class InteractionHandler {
 
     let {nodesChanges, edgesChanges} = this._determineIfDifferent(previousSelection, currentSelection);
 
-    if (selectedNodesCount - previouslySelectedNodeCount > 0 || (selectedNodesCount === previouslySelectedNodeCount && nodesChanges === true)) { // node was selected
+    if (selectedNodesCount - previouslySelectedNodeCount > 0) { // node was selected
       this.selectionHandler._generateClickEvent('selectNode', event, pointer);
       selected = true;
     }
@@ -198,15 +198,26 @@ class InteractionHandler {
       this.selectionHandler._generateClickEvent('deselectNode', event, pointer, previousSelection);
       selected = true;
     }
+    else if (selectedNodesCount === previouslySelectedNodeCount && nodesChanges === true) {
+      this.selectionHandler._generateClickEvent('deselectNode', event, pointer, previousSelection);
+      this.selectionHandler._generateClickEvent('selectNode', event, pointer);
+      selected = true;
+    }
 
-    if (selectedEdgesCount - previouslySelectedEdgeCount > 0|| (selectedEdgesCount === previouslySelectedEdgeCount && edgesChanges === true)) { // node was selected
+    if (selectedEdgesCount - previouslySelectedEdgeCount > 0) { // edge was selected
       this.selectionHandler._generateClickEvent('selectEdge', event, pointer);
       selected = true;
     }
-    else if (selectedEdgesCount - previouslySelectedEdgeCount < 0) { // node was deselected
+    else if (selectedEdgesCount - previouslySelectedEdgeCount < 0) { // edge was deselected
       this.selectionHandler._generateClickEvent('deselectEdge', event, pointer, previousSelection);
       selected = true;
     }
+    else if (selectedEdgesCount === previouslySelectedEdgeCount && edgesChanges === true) {
+      this.selectionHandler._generateClickEvent('deselectEdge', event, pointer, previousSelection);
+      this.selectionHandler._generateClickEvent('selectEdge', event, pointer);
+      selected = true;
+    }
+
 
     if (selected === true) { // select or unselect
       this.selectionHandler._generateClickEvent('select', event, pointer);