Preparing to publish 3.2.21

cytoscape · Nov 28, 2018 · 2addaa0 · 2addaa0
1 parent 30db81b
commit 2addaa0
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 24 deletions.
diff --git a/dist/cytoscape.cjs.js b/dist/cytoscape.cjs.js
@@ -14924,16 +14924,49 @@ styfn.getStylePropertyValue = function (ele, propName, isRenderedVal) {
 
     var type = prop.type;
     var styleProp = ele.pstyle(prop.name);
-    var zoom = ele.cy().zoom();
 
     if (styleProp) {
-      var units = styleProp.units ? type.implicitUnits || 'px' : null;
-      var val = units ? [].concat(styleProp.pfValue).map(function (pfValue) {
-        return pfValue * (isRenderedVal ? zoom : 1) + units;
-      }).join(' ') : styleProp.strValue;
+      var value = styleProp.value,
+          units = styleProp.units,
+          strValue = styleProp.strValue;
 
-      return val;
+
+      if (isRenderedVal && type.number && value != null && is.number(value)) {
+        var zoom = ele.cy().zoom();
+        var getRenderedValue = function getRenderedValue(val) {
+          return val * zoom;
+        };
+        var getValueStringWithUnits = function getValueStringWithUnits(val, units) {
+          return getRenderedValue(val) + units;
+        };
+        var isArrayValue = is.array(value);
+        var haveUnits = isArrayValue ? units.every(function (u) {
+          return u != null;
+        }) : units != null;
+
+        if (haveUnits) {
+          if (isArrayValue) {
+            return value.map(function (v, i) {
+              return getValueStringWithUnits(v, units[i]);
+            }).join(' ');
+          } else {
+            return getValueStringWithUnits(value, units);
+          }
+        } else {
+          if (isArrayValue) {
+            return value.map(function (v) {
+              return is.string(v) ? v : '' + getRenderedValue(v);
+            }).join(' ');
+          } else {
+            return '' + getRenderedValue(value);
+          }
+        }
+      } else if (strValue != null) {
+        return strValue;
+      }
     }
+
+    return null;
   }
 };
 
@@ -18734,7 +18767,7 @@ CoseLayout.prototype.run = function () {
     do {
       var f = 0;
 
-      while (f < options.refresh && i < options.numIter) {
+      while ((f < options.refresh || options.refresh === 0) && i < options.numIter) {
         var loopRet = mainLoop(i);
         if (!loopRet) {
           break;
@@ -29172,7 +29205,7 @@ module.exports = Stylesheet;
 "use strict";
 
 
-module.exports = "3.2.20";
+module.exports = "3.2.21";
 
 /***/ })
 /******/ ]);

diff --git a/dist/cytoscape.js b/dist/cytoscape.js
@@ -15686,16 +15686,49 @@ styfn.getStylePropertyValue = function (ele, propName, isRenderedVal) {
 
     var type = prop.type;
     var styleProp = ele.pstyle(prop.name);
-    var zoom = ele.cy().zoom();
 
     if (styleProp) {
-      var units = styleProp.units ? type.implicitUnits || 'px' : null;
-      var val = units ? [].concat(styleProp.pfValue).map(function (pfValue) {
-        return pfValue * (isRenderedVal ? zoom : 1) + units;
-      }).join(' ') : styleProp.strValue;
+      var value = styleProp.value,
+          units = styleProp.units,
+          strValue = styleProp.strValue;
 
-      return val;
+
+      if (isRenderedVal && type.number && value != null && is.number(value)) {
+        var zoom = ele.cy().zoom();
+        var getRenderedValue = function getRenderedValue(val) {
+          return val * zoom;
+        };
+        var getValueStringWithUnits = function getValueStringWithUnits(val, units) {
+          return getRenderedValue(val) + units;
+        };
+        var isArrayValue = is.array(value);
+        var haveUnits = isArrayValue ? units.every(function (u) {
+          return u != null;
+        }) : units != null;
+
+        if (haveUnits) {
+          if (isArrayValue) {
+            return value.map(function (v, i) {
+              return getValueStringWithUnits(v, units[i]);
+            }).join(' ');
+          } else {
+            return getValueStringWithUnits(value, units);
+          }
+        } else {
+          if (isArrayValue) {
+            return value.map(function (v) {
+              return is.string(v) ? v : '' + getRenderedValue(v);
+            }).join(' ');
+          } else {
+            return '' + getRenderedValue(value);
+          }
+        }
+      } else if (strValue != null) {
+        return strValue;
+      }
     }
+
+    return null;
   }
 };
 
@@ -19496,7 +19529,7 @@ CoseLayout.prototype.run = function () {
     do {
       var f = 0;
 
-      while (f < options.refresh && i < options.numIter) {
+      while ((f < options.refresh || options.refresh === 0) && i < options.numIter) {
         var loopRet = mainLoop(i);
         if (!loopRet) {
           break;
@@ -29934,7 +29967,7 @@ module.exports = Stylesheet;
 "use strict";
 
 
-module.exports = "3.2.20";
+module.exports = "3.2.21";
 
 /***/ })
 /******/ ]);

diff --git a/dist/cytoscape.min.js b/dist/cytoscape.min.js
diff --git a/documentation/docmaker.json b/documentation/docmaker.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.2.20",
+  "version": "3.2.21",
 
   "fnArgLinks": {
     "selector": "#selectors",

diff --git a/documentation/index.html b/documentation/index.html
diff --git a/documentation/js/cytoscape.min.js b/documentation/js/cytoscape.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cytoscape",
-  "version": "3.2.20",
+  "version": "3.2.21",
   "license": "MIT",
   "description": "Graph theory (a.k.a. network) library for analysis and visualisation",
   "homepage": "http://js.cytoscape.org",

diff --git a/src/version.js b/src/version.js
@@ -1 +1 @@
-module.exports = "3.2.20";
+module.exports = "3.2.21";