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

HISTORY.md

@@ -54,6 +54,8 @@ http://visjs.org
 - Community fix for SVG images in IE11, thanks @dponch!
 - Fixed repeating stabilized event when the network is already stabilized.
 - Added circularImages, thanks for the contribution @brendon1982!
+- Stopped infinite loop when brokenImage is also not available.
+- Changed util color functions so they don't need eval. Thanks @naskooskov!
 
 ### Graph2d
 

lib/network/Images.js

@@ -4,6 +4,7 @@
  */
 function Images() {
   this.images = {};
+  this.imageBroken = {};
   this.callback = undefined;
 }
 
@@ -23,13 +24,12 @@ Images.prototype.setOnloadCallback = function(callback) {
  * @return {Image} img          The image object
  */
 Images.prototype.load = function(url, brokenUrl) {
-  var img = this.images[url];
+  var img = this.images[url]; // make a pointer
   if (img === undefined) {
     // create the image
     var me = this;
     img = new Image();
     img.onload = function () {
-
       // IE11 fix -- thanks dponch!
       if (this.width == 0) {
         document.body.appendChild(this);
@@ -52,8 +52,16 @@ Images.prototype.load = function(url, brokenUrl) {
           me.callback(this);
         }
       }
+      else if (me.imageBroken[url] === true) {
+        console.error("Could not load brokenImage:", brokenUrl);
+        delete this.src;
+        if (me.callback) {
+          me.callback(this);
+        }
+      }
       else {
         this.src = brokenUrl;
+        me.imageBroken[url] = true;
       }
     };
 

lib/util.js

@@ -737,48 +737,36 @@ exports.option.asElement = function (value, defaultValue) {
   return value || defaultValue || null;
 };
 
-
-
-exports.GiveDec = function(Hex) {
-  var Value;
-
-  if (Hex == "A")
-    Value = 10;
-  else if (Hex == "B")
-    Value = 11;
-  else if (Hex == "C")
-    Value = 12;
-  else if (Hex == "D")
-    Value = 13;
-  else if (Hex == "E")
-    Value = 14;
-  else if (Hex == "F")
-    Value = 15;
-  else
-    Value = eval(Hex);
-
-  return Value;
+/**
+ * http://stackoverflow.com/questions/5623838/rgb-to-hex-and-hex-to-rgb
+ *
+ * @param {String} hex
+ * @returns {{r: *, g: *, b: *}} | 255 range
+ */
+exports.hexToRGB = function(hex) {
+  // Expand shorthand form (e.g. "03F") to full form (e.g. "0033FF")
+  var shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
+  hex = hex.replace(shorthandRegex, function(m, r, g, b) {
+      return r + r + g + g + b + b;
+  });
+  var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+  return result ? {
+      r: parseInt(result[1], 16),
+      g: parseInt(result[2], 16),
+      b: parseInt(result[3], 16)
+  } : null;
 };
 
-exports.GiveHex = function(Dec) {
-  var Value;
-
-  if(Dec == 10)
-    Value = "A";
-  else if (Dec == 11)
-    Value = "B";
-  else if (Dec == 12)
-    Value = "C";
-  else if (Dec == 13)
-    Value = "D";
-  else if (Dec == 14)
-    Value = "E";
-  else if (Dec == 15)
-    Value = "F";
-  else
-    Value = "" + Dec;
-
-  return Value;
+/**
+ *
+ * @param red     0 -- 255
+ * @param green   0 -- 255
+ * @param blue    0 -- 255
+ * @returns {string}
+ * @constructor
+ */
+exports.RGBToHex = function(red,green,blue) {
+  return "#" + ((1 << 24) + (red << 16) + (green << 8) + blue).toString(16).slice(1);
 };
 
 /**
@@ -862,42 +850,6 @@ exports.parseColor = function(color) {
   return c;
 };
 
-/**
- * http://www.yellowpipe.com/yis/tools/hex-to-rgb/color-converter.php
- *
- * @param {String} hex
- * @returns {{r: *, g: *, b: *}}
- */
-exports.hexToRGB = function(hex) {
-  hex = hex.replace("#","").toUpperCase();
-
-  var a = exports.GiveDec(hex.substring(0, 1));
-  var b = exports.GiveDec(hex.substring(1, 2));
-  var c = exports.GiveDec(hex.substring(2, 3));
-  var d = exports.GiveDec(hex.substring(3, 4));
-  var e = exports.GiveDec(hex.substring(4, 5));
-  var f = exports.GiveDec(hex.substring(5, 6));
-
-  var r = (a * 16) + b;
-  var g = (c * 16) + d;
-  var b = (e * 16) + f;
-
-  return {r:r,g:g,b:b};
-};
-
-exports.RGBToHex = function(red,green,blue) {
-  var a = exports.GiveHex(Math.floor(red / 16));
-  var b = exports.GiveHex(red % 16);
-  var c = exports.GiveHex(Math.floor(green / 16));
-  var d = exports.GiveHex(green % 16);
-  var e = exports.GiveHex(Math.floor(blue / 16));
-  var f = exports.GiveHex(blue % 16);
-
-  var hex = a + b + c + d + e + f;
-  return "#" + hex;
-};
-
-
 /**
  * http://www.javascripter.net/faq/rgb2hsv.htm
  *