Changeset 13875 for trunk/FACT++

Timestamp:

05/24/12 15:32:55 (12 years ago)

Author:

tbretz

Message:

Included a function to properly convert html special chars to unicode

File:

• trunk/FACT++/www/smartfact/index.js (modified) (3 diffs)

trunk/FACT++/www/smartfact/index.js

@@ -163 +163 @@
 function valid(str) { if (str==undefined) return false; if (str.length==0) return false; return true;}
 function isSliding() { var z = $("body").getAttribute("data-visible"); return $("table"+z).offsetLeft!=0; }
+function htmlDecode(input) { var e = document.createElement('div'); e.innerHTML = input; return e.childNodes[0].nodeValue; }
 
 function cycleCol(el)
@@ -1274 +1275 @@
     var umax = data[2];
 
-    var unit = canv.getAttribute("data-data");//.split("/");
-    unit = unit.replace("°",   "\u00B0");
-    unit = unit.replace("µ", "\u00B5");
-    unit = unit.replace("²",  "\u00B2");
-    unit = unit.replace("³",  "\u00B3");
+    var unit = htmlDecode(canv.getAttribute("data-data"));
+    //unit = unit.replace("°",   "\u00B0");
+    //unit = unit.replace("µ", "\u00B5");
+    //unit = unit.replace("²",  "\u00B2");
+    //unit = unit.replace("³",  "\u00B3");
 
     var min = data[3]+unit
@@ -1318 +1319 @@
 function drawGraph(canv, vals, data)
 {
-    var unit = canv.getAttribute("data-data");//.split("/");
-    unit = unit.replace("°",   "\u00B0");
-    unit = unit.replace("µ", "\u00B5");
-    unit = unit.replace("²",  "\u00B2");
-    unit = unit.replace("³",  "\u00B3");
+    var unit = htmlDecode(canv.getAttribute("data-data"));//.split("/");
+
+    //unit = unit.replace("°",   "\u00B0");
+    //unit = unit.replace("µ", "\u00B5");
+    //unit = unit.replace("²",  "\u00B2");
+    //unit = unit.replace("³",  "\u00B3");
 
     var umin = vals[1]+unit;