cytoscape - npm Package Compare versions

Comparing version 2.7.26 to 2.7.27

dist/thread-node-fork.js

 
 /*!
 
-Cytoscape.js 2.7.26 (MIT licensed)
+Cytoscape.js 2.7.27 (MIT licensed)
 
@@ -6,0 +6,0 @@ Copyright (c) The Cytoscape Consortium

package.json

 {
   "name": "cytoscape",
-  "version": "2.7.26",
+  "version": "2.7.27",
   "license": "MIT",
@@ -5,0 +5,0 @@ "description": "Graph theory (a.k.a. network) library for analysis and visualisation",

src/extensions/renderer/canvas/ele-texture-cache.js

@@ -205,3 +205,3 @@ 'use strict';
     } else {
-      self.queueElement( ele, bb, higherCache.level - 1 );
+      self.queueElement( ele, higherCache.level - 1 );
 
@@ -224,3 +224,3 @@ return higherCache;
 
-      self.queueElement( ele, bb, lvl );
+      self.queueElement( ele, lvl );
 
@@ -277,2 +277,5 @@ return lowerCache;
 
+        // remove from queue since the old req was for the old state
+        self.removeFromQueue( ele );
+
         // might have to remove the entire texture if it's not efficiently using its space
@@ -393,3 +396,3 @@ self.checkTextureUtility( txr );
 
-ETCp.queueElement = function( ele, bb, lvl ){
+ETCp.queueElement = function( ele, lvl ){
   var self = this;
@@ -409,4 +412,2 @@ var q = self.getElementQueue();
       ele: ele,
-      bb: bb,
-      position: math.copyPosition( ele.position() ),
       level: lvl,
@@ -416,9 +417,2 @@ reqs: 1
 
-    if( ele.isEdge() ){
-      req.positions = {
-        source: math.copyPosition( ele.source().position() ),
-        target: math.copyPosition( ele.target().position() )
-      };
-    }
-
     q.push( req );
@@ -439,25 +433,17 @@
       var req = q.pop();
+      var ele = req.ele;
+      var caches = ele._private.rscratch.imgCaches;
 
-      id2q[ req.ele.id() ] = null;
+      // dequeueing isn't necessary when an existing cache exists
+      if( caches[ req.level ] != null ){
+        continue;
+      }
 
+      id2q[ ele.id() ] = null;
+
       dequeued.push( req );
 
-      var ele = req.ele;
-      var bb;
+      var bb = ele.boundingBox();
 
-      if(
-        ( ele.isEdge()
-          && (
-            !math.arePositionsSame( ele.source().position(), req.positions.source )
-            || !math.arePositionsSame( ele.target().position(), req.positions.target )
-          )
-        )
-        || ( !math.arePositionsSame( ele.position(), req.position ) )
-      ){
-        bb = ele.boundingBox();
-      } else {
-        bb = req.bb;
-      }
-
-      self.getElement( req.ele, bb, pxRatio, req.level, getTxrReasons.dequeue );
+      self.getElement( ele, bb, pxRatio, req.level, getTxrReasons.dequeue );
     } else {
@@ -471,2 +457,19 @@ break;
 
+ETCp.removeFromQueue = function( ele ){
+  var self = this;
+  var q = self.getElementQueue();
+  var id2q = self.getElementIdToQueue();
+  var req = id2q[ ele.id() ];
+
+  if( req != null ){
+    // bring to front of queue
+    req.reqs = util.MAX_INT;
+    q.updateItem( req );
+
+    q.pop(); // remove from queue
+
+    id2q[ ele.id() ] = null; // remove from lookup map
+  }
+};
+
 ETCp.onDequeue = function( fn ){ this.onDequeues.push( fn ); };
@@ -493,3 +496,3 @@ ETCp.offDequeue = function( fn ){ util.removeFromArray( this.onDequeues, fn ); };
     for( var i = 0; i < deqd.length; i++ ){
-      var bb = deqd[i].bb;
+      var bb = deqd[i].ele.boundingBox();
 
@@ -496,0 +499,0 @@ if( math.boundingBoxesIntersect( bb, extent ) ){

src/util/index.js

@@ -10,2 +10,4 @@ 'use strict';
 
+  MAX_INT: Number.MAX_SAFE_INTEGER || 9007199254740991,
+
   trueify: function(){ return true; },
@@ -12,0 +14,0 @@

src/version.js

@@ -1,1 +0,1 @@
-module.exports = "2.7.26";
+module.exports = "2.7.27";

No alert changes

Improved metrics

Total package byte prevSize

4343056

No dependency changes