annot-server/webapp/templates/annotviz.html
changeset 119 e6605fecb175
parent 113 7531e4180915
child 131 0bb70072a56f
--- a/annot-server/webapp/templates/annotviz.html	Thu Jan 22 11:18:58 2015 +0100
+++ b/annot-server/webapp/templates/annotviz.html	Thu Jan 22 12:12:33 2015 +0100
@@ -38,11 +38,6 @@
         }
     ];
 
-    function colorToHex(c) {
-        var m = /rgba?\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)/.exec(c);
-        return m ? '#' + (1 << 24 | m[1] << 16 | m[2] << 8 | m[3]).toString(16).substr(1) : c;
-    }
-
     function getAnnotCategories(ecode, serverUrl) {
 
         var url = serverUrl+"/p/api/v1/event/" + ecode;
@@ -63,7 +58,7 @@
                 var categoriesJson = session.categories_json;
                 annotCat.order = categoriesJson.order;
                 categoriesJson.categories.forEach(function(cat) {
-                    annotCat.colors[cat.code] = colorToHex(cat.color);
+                    annotCat.colors[cat.code] = annotviz.colorToHex(cat.color);
                 });
                 annotCat.defaultColor = categoriesJson.defaultColor || "#536991";
                 annotCategories.push(annotCat);