Cache colorized icon, fix Firefox compatibility

Lionel Laské · Lionel Laské · commit 1d912782653d · 2013-12-12T22:02:48.000+01:00
diff --git a/activities/Clock.activity/lib/sugar-web/graphics/icon.js b/activities/Clock.activity/lib/sugar-web/graphics/icon.js
@@ -46,8 +46,8 @@ define(function () {
             var newData = changeColors(iconData, fillColor, strokeColor);
             callback(dataHeader + escape(newData));
         };
-
-        client.open("GET", source);
+		
+        client.open("GET", source.replace(/"/g,""));
         client.send();
     };
 
@@ -66,7 +66,7 @@ define(function () {
             "uri": getBackgroundURL(elem),
             "strokeColor": colors.stroke,
             "fillColor": colors.fill
-        };
+        };	
 
         icon.load(iconInfo, function (url) {
             setBackgroundURL(elem, url);
diff --git a/activities/ConnecttheDots.activity/lib/sugar-web/graphics/icon.js b/activities/ConnecttheDots.activity/lib/sugar-web/graphics/icon.js
@@ -46,8 +46,8 @@ define(function () {
             var newData = changeColors(iconData, fillColor, strokeColor);
             callback(dataHeader + escape(newData));
         };
-
-        client.open("GET", source);
+		
+        client.open("GET", source.replace(/"/g,""));
         client.send();
     };
 
@@ -66,7 +66,7 @@ define(function () {
             "uri": getBackgroundURL(elem),
             "strokeColor": colors.stroke,
             "fillColor": colors.fill
-        };
+        };	
 
         icon.load(iconInfo, function (url) {
             setBackgroundURL(elem, url);
diff --git a/activities/Gears.activity/lib/sugar-web/graphics/icon.js b/activities/Gears.activity/lib/sugar-web/graphics/icon.js
@@ -46,8 +46,8 @@ define(function () {
             var newData = changeColors(iconData, fillColor, strokeColor);
             callback(dataHeader + escape(newData));
         };
-
-        client.open("GET", source);
+		
+        client.open("GET", source.replace(/"/g,""));
         client.send();
     };
 
@@ -66,7 +66,7 @@ define(function () {
             "uri": getBackgroundURL(elem),
             "strokeColor": colors.stroke,
             "fillColor": colors.fill
-        };
+        };	
 
         icon.load(iconInfo, function (url) {
             setBackgroundURL(elem, url);
diff --git a/activities/GetThingsDone.activity/lib/sugar-web/graphics/icon.js b/activities/GetThingsDone.activity/lib/sugar-web/graphics/icon.js
@@ -46,8 +46,8 @@ define(function () {
             var newData = changeColors(iconData, fillColor, strokeColor);
             callback(dataHeader + escape(newData));
         };
-
-        client.open("GET", source);
+		
+        client.open("GET", source.replace(/"/g,""));
         client.send();
     };
 
@@ -66,7 +66,7 @@ define(function () {
             "uri": getBackgroundURL(elem),
             "strokeColor": colors.stroke,
             "fillColor": colors.fill
-        };
+        };	
 
         icon.load(iconInfo, function (url) {
             setBackgroundURL(elem, url);
diff --git a/activities/LastOneLoses.activity/lib/sugar-web/graphics/icon.js b/activities/LastOneLoses.activity/lib/sugar-web/graphics/icon.js
@@ -46,8 +46,8 @@ define(function () {
             var newData = changeColors(iconData, fillColor, strokeColor);
             callback(dataHeader + escape(newData));
         };
-
-        client.open("GET", source);
+		
+        client.open("GET", source.replace(/"/g,""));
         client.send();
     };
 
@@ -66,7 +66,7 @@ define(function () {
             "uri": getBackgroundURL(elem),
             "strokeColor": colors.stroke,
             "fillColor": colors.fill
-        };
+        };	
 
         icon.load(iconInfo, function (url) {
             setBackgroundURL(elem, url);
diff --git a/activities/Markdown.activity/lib/sugar-web/graphics/icon.js b/activities/Markdown.activity/lib/sugar-web/graphics/icon.js
@@ -46,8 +46,8 @@ define(function () {
             var newData = changeColors(iconData, fillColor, strokeColor);
             callback(dataHeader + escape(newData));
         };
-
-        client.open("GET", source);
+		
+        client.open("GET", source.replace(/"/g,""));
         client.send();
     };
 
@@ -66,7 +66,7 @@ define(function () {
             "uri": getBackgroundURL(elem),
             "strokeColor": colors.stroke,
             "fillColor": colors.fill
-        };
+        };	
 
         icon.load(iconInfo, function (url) {
             setBackgroundURL(elem, url);
diff --git a/activities/Memorize.activity/lib/sugar-web/graphics/icon.js b/activities/Memorize.activity/lib/sugar-web/graphics/icon.js
@@ -46,8 +46,8 @@ define(function () {
             var newData = changeColors(iconData, fillColor, strokeColor);
             callback(dataHeader + escape(newData));
         };
-
-        client.open("GET", source);
+		
+        client.open("GET", source.replace(/"/g,""));
         client.send();
     };
 
@@ -66,7 +66,7 @@ define(function () {
             "uri": getBackgroundURL(elem),
             "strokeColor": colors.stroke,
             "fillColor": colors.fill
-        };
+        };	
 
         icon.load(iconInfo, function (url) {
             setBackgroundURL(elem, url);
diff --git a/activities/Paint.activity/lib/sugar-web/graphics/icon.js b/activities/Paint.activity/lib/sugar-web/graphics/icon.js
@@ -46,8 +46,8 @@ define(function () {
             var newData = changeColors(iconData, fillColor, strokeColor);
             callback(dataHeader + escape(newData));
         };
-
-        client.open("GET", source);
+		
+        client.open("GET", source.replace(/"/g,""));
         client.send();
     };
 
@@ -66,7 +66,7 @@ define(function () {
             "uri": getBackgroundURL(elem),
             "strokeColor": colors.stroke,
             "fillColor": colors.fill
-        };
+        };	
 
         icon.load(iconInfo, function (url) {
             setBackgroundURL(elem, url);
diff --git a/activities/Stopwatch.activity/lib/sugar-web/graphics/icon.js b/activities/Stopwatch.activity/lib/sugar-web/graphics/icon.js
@@ -46,8 +46,8 @@ define(function () {
             var newData = changeColors(iconData, fillColor, strokeColor);
             callback(dataHeader + escape(newData));
         };
-
-        client.open("GET", source);
+		
+        client.open("GET", source.replace(/"/g,""));
         client.send();
     };
 
@@ -66,7 +66,7 @@ define(function () {
             "uri": getBackgroundURL(elem),
             "strokeColor": colors.stroke,
             "fillColor": colors.fill
-        };
+        };	
 
         icon.load(iconInfo, function (url) {
             setBackgroundURL(elem, url);
diff --git a/activities/WelcomeWeb.activity/lib/sugar-web/graphics/icon.js b/activities/WelcomeWeb.activity/lib/sugar-web/graphics/icon.js
@@ -46,8 +46,8 @@ define(function () {
             var newData = changeColors(iconData, fillColor, strokeColor);
             callback(dataHeader + escape(newData));
         };
-
-        client.open("GET", source);
+		
+        client.open("GET", source.replace(/"/g,""));
         client.send();
     };
 
@@ -66,7 +66,7 @@ define(function () {
             "uri": getBackgroundURL(elem),
             "strokeColor": colors.stroke,
             "fillColor": colors.fill
-        };
+        };	
 
         icon.load(iconInfo, function (url) {
             setBackgroundURL(elem, url);
diff --git a/js/activityicon.js b/js/activityicon.js
@@ -1,4 +1,9 @@
 
+// Colorized icons cache
+var iconColorCache = {
+	names: [],
+	values: []
+};
 
 
 // Class for a Sugar Web activity icon
@@ -23,8 +28,25 @@ enyo.kind({
 	// Render
 	rendered: function() {
 		this.inherited(arguments);
-		if (this.colorized)
-			iconLib.colorize(this.$.icon.hasNode(), preferences.getColor());
+		
+		// If colorized
+		if (this.colorized) {
+			// Try to find colorized version in cache
+			var node = this.$.icon.hasNode();
+			var name = this.activity.directory+"/"+this.activity.icon;
+			for (var i = 0 ; i < iconColorCache.names.length ; i++)
+				if (iconColorCache.names[i] == name) {
+					node.style.backgroundImage = iconColorCache.values[i];
+					return;
+				}
+			
+			// Build it
+			iconLib.colorize(node, preferences.getColor(), function() {
+				// Cache it			
+				iconColorCache.names.push(name);
+				iconColorCache.values.push(node.style.backgroundImage);
+			});
+		}
 	},
 	
 	// Property changed
diff --git a/lib/sugar-web/graphics/icon.js b/lib/sugar-web/graphics/icon.js
@@ -46,8 +46,8 @@ define(function () {
             var newData = changeColors(iconData, fillColor, strokeColor);
             callback(dataHeader + escape(newData));
         };
-
-        client.open("GET", source);
+		
+        client.open("GET", source.replace(/"/g,""));
         client.send();
     };
 
