Changeset 24925 for gs3-extensions/html-to-expeditee/trunk

Timestamp:

2012-01-09T11:20:24+13:00 (12 years ago)

Author:

davidb

Message:

Shift from generating string to JSON tree for output

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

@@ -89 +89 @@
     depth = (depth) ? depth : 0;
 
-    var expSyntax = "";
+    //var expSyntax = "";
+    var jsonNode = {};
 
     if (node.nodeType == 3) { /* text node */
@@ -95 +96 @@
 
         if (text.match(/\S/)) {
-        for (var i=0; i<depth; i++) { expSyntax += "  "; }
-        expSyntax += "Text item: " + node.nodeValue + "\n";
+        //for (var i=0; i<depth; i++) { expSyntax += "  "; }
+        //expSyntax += "Text item: " + node.nodeValue + "\n";
+
+        jsonNode.type = "text";
+        jsonNode.text = node.nodeValue;
     }
     }
@@ -114 +118 @@
         var yb = nodePos.yb;
 
+/*
         var rectSyntax = "";
+
         for (var i=0; i<depth; i++) { rectSyntax += "  "; }
+
         rectSyntax += "Rect item " + node.nodeName + ": ";
         rectSyntax += xl + " " + yt + " " + xr + " " + yb + "\n";
 
         expSyntax += rectSyntax;
+*/
+
+        var rect = { "xl":xl, "yt":yt, "xr":xr, "yb":yb };
+
+        jsonNode.type = "rect";
+            jsonNode.elem = node.nodeName;
+        jsonNode.rect = rect;
+    
+            var jsonChildNodes = [];
 
         var cnode = node.firstChild; 
         while (cnode != null) {
-        expSyntax += htmlToExpeditee(cnode,depth+1);  
+        //expSyntax += htmlToExpeditee(cnode,depth+1);  
+
+            var jsonChildNode = htmlToExpeditee(cnode,depth+1);
+        jsonChildNodes.push(jsonChildNode);  
         
-        cnode = cnode.nextSibling ;
+        cnode = cnode.nextSibling;
         }
 
+        jsonNode.childNodes = jsonChildNodes;
     }
 
@@ -133 +153 @@
     /* currently do nothing for the other node types */
 
-    return expSyntax;
+    return jsonNode;
+    //return expSyntax;
 }