The rules to ignore parent nodes or edges in the element texture cach…

…es should be checked before the `lookup.get()` call.
cytoscape · Oct 22, 2018 · 7305b6c · 7305b6c
1 parent 0367344
commit 7305b6c
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/extensions/renderer/canvas/ele-texture-cache.js b/src/extensions/renderer/canvas/ele-texture-cache.js
@@ -104,6 +104,13 @@ ETCp.getElement = function( ele, bb, pxRatio, lvl, reason ){
 
   if( bb.w === 0 || bb.h === 0 || !ele.visible() ){ return null; }
 
+  if(
+    ( !self.allowEdgeTxrCaching && ele.isEdge() )
+    || ( !self.allowParentTxrCaching && ele.isParent() )
+  ){
+    return null;
+  }
+
   if( lvl == null ){
     lvl = Math.ceil( math.log2( zoom * pxRatio ) );
   }
@@ -143,12 +150,7 @@ ETCp.getElement = function( ele, bb, pxRatio, lvl, reason ){
     txrH = Math.ceil( eleScaledH / txrStepH ) * txrStepH;
   }
 
-  if(
-    eleScaledH > maxTxrH
-    || eleScaledW > maxTxrW
-    || ( !self.allowEdgeTxrCaching && ele.isEdge() )
-    || ( !self.allowParentTxrCaching && ele.isParent() )
-  ){
+  if( eleScaledH > maxTxrH || eleScaledW > maxTxrW ){
     return null; // caching large elements is not efficient
   }