Merge branch 'unstable'

iVis-at-Bilkent · Jun 18, 2018 · 5ad2f0b · 5ad2f0b
2 parents 6d12b9f + d7dea4a
commit 5ad2f0b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 169 deletions.
diff --git a/cytoscape-expand-collapse.js b/cytoscape-expand-collapse.js
diff --git a/npm-debug.log b/npm-debug.log
diff --git a/src/elementUtilities.js b/src/elementUtilities.js
@@ -2,14 +2,14 @@ function elementUtilities(cy) {
  return {
   moveNodes: function (positionDiff, nodes, notCalcTopMostNodes) {
     var topMostNodes = notCalcTopMostNodes ? nodes : this.getTopMostNodes(nodes);
+    topMostNodes.positions(function(ele, i){
+      return {
+        x: topMostNodes[i].position("x") + positionDiff.x,
+        y: topMostNodes[i].position("y") + positionDiff.y
+      };
+    });
     for (var i = 0; i < topMostNodes.length; i++) {
       var node = topMostNodes[i];
-      var oldX = node.position("x");
-      var oldY = node.position("y");
-      node.position({
-        x: oldX + positionDiff.x,
-        y: oldY + positionDiff.y
-      });
       var children = node.children();
       this.moveNodes(positionDiff, children, true);
     }

diff --git a/src/expandCollapseUtilities.js b/src/expandCollapseUtilities.js
@@ -467,7 +467,10 @@ return {
    * Moves the node by moving its descandents. Movement is animated if both single and animate flags are truthy.
    */
   fishEyeViewMoveNode: function (node, T_x, T_y, nodeToExpand, single, animate, layoutBy) {
-    var childrenList = node.children(":visible");
+    var childrenList = cy.collection();
+    if(node.isParent()){
+       childrenList = node.children(":visible");
+    }
     var self = this;
 
     /*