Changeset 24941 for gs3-extensions/html-to-expeditee/trunk/src/src/js/html-to-expeditee.js

Timestamp:

2012-01-12T11:03:59+13:00 (12 years ago)

Author:

davidb

Message:

Work on converting CSS style attributes to Expeditee attributes

File:

• gs3-extensions/html-to-expeditee/trunk/src/src/js/html-to-expeditee.js (modified) (4 diffs)

gs3-extensions/html-to-expeditee/trunk/src/src/js/html-to-expeditee.js

@@ -52 +52 @@
 }
 
-function getStyle(node,styleProp)
-{
+function hyphenToInitialCapReplacer(str, p1, offset, s)  
+{  
+    return p1.toUpperCase();
+}  
+
+function getStyle(node,style_prop)
+{
+    var prop_val;
     if (node.currentStyle) {
-    var y = node.currentStyle[styleProp];
+    /* IE */
+    style_prop = strCssRule.replace(/\-(\w)/g, hyphenToInitialCapReplacer);
+    prop_val = node.currentStyle[style_prop];
     }
     else if (window.getComputedStyle) {
-    var y = document.defaultView.getComputedStyle(node,null).getPropertyValue(styleProp);
-    }
-    return y;
+    /* Firefox */
+    var computed_style = document.defaultView.getComputedStyle(node,null)
+    prop_val = computed_style.getPropertyValue(style_prop);
+    }
+    else {
+    /* try for inline value */
+    prop_val = el.style[style_prop];
+    }
+
+    return prop_val;
+
 }
 
@@ -110 +126 @@
         jsonNode.text = node.nodeValue;
 
-        jsonNode.x = pxl;
-        jsonNode.y = pyt;
+        jsonNode.xl = pxl;
+        jsonNode.yt = pyt;
+        jsonNode.xr = pxr;
+        jsonNode.yb = pyb;
 
     }
@@ -119 +137 @@
     /* need to handle: img, a, li */
         /* need to dig out: text size, l/r/justified, font-face, type, colour */
+
+    if (getStyle(node,"visibility").match("hidden")
+        || getStyle(node,"display").match("none")) {
+
+        return null;
+    }
 
         var elemName = node.nodeName.toLowerCase();
@@ -137 +161 @@
         jsonNode.rect = rect;
     
+        if (elemName.match("img")) {
+        jsonNode.img = node.src;
+        }
 
         var style = {};
 
-        style["font-family"] = getStyle(node,"font-family");
+        style["font-family"]      = getStyle(node,"font-family");
+        style["font-size"]        = getStyle(node,"font-size");
         style["background-color"] = getStyle(node,"background-color");
 
+        // console.log("font size = " + style["font-size"]);
+ 
         jsonNode.style = style