X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=resources%2Froo.builder.js;h=bf08085d2ecf627b43a7ddd80dcf7b0ba0532b76;hb=ea6cbc738a355fb441b4b7025e13a0679f9b5bd7;hp=6fb9ed62eae04b1757075f117017ab2cad07f8bf;hpb=9f4e82d5a22410ae1c8da83471e1f55db7b531a0;p=app.Builder.js

diff --git a/resources/roo.builder.js b/resources/roo.builder.js
index 6fb9ed62e..bf08085d2 100644
--- a/resources/roo.builder.js
+++ b/resources/roo.builder.js
@@ -35,12 +35,12 @@ Builder  = {
         
         
         traverseDOMTree : function(cb, currentElement, depth) {
-            if (!currentElement) {
+            if (!currentElement ) {
                 
                 return;
             }
             //console.log(currentElement);
-            if (currentElement.className.match(/roo-dynamic/)) {
+            if (currentElement.className && currentElement.className.match(/roo-dynamic/)) {
                 return;
             }
             
@@ -54,6 +54,9 @@ Builder  = {
                 return;
             
             }
+            if (nodeName.match(/^#/)) { // comments?
+                return;
+            }
              
             
             
@@ -62,8 +65,13 @@ Builder  = {
                 return;
             }
             if (nodeName != 'BODY') {
-                
-            
+                //Roo.log(currentElement);
+                if (currentElement.hasAttribute('flexy:include')) {
+
+
+                    cb( '<flexy:include src="'+currentElement.getAttribute('flexy:include')+'"></flexy:include>');
+                    return;
+                }
             
                 var i = 0;
               // Prints the node tagName, such as <A>, <IMG>, etc
@@ -90,9 +98,7 @@ Builder  = {
             } else {
                 tagName = false;
             }
-            if (currentElement.hasAttribute('flexy:include')) {
-                cb( tagName ? "</"+tagName+">" : '');
-            }
+            
             
             // Traverse the tree
             i = 0;
@@ -325,7 +331,7 @@ Builder  = {
             //Roo.log("add flexy:if");
             tree.el.attr('flexy:include', tree['flexy:include']);
         }
-        Roo.log("Add xtype")
+        //Roo.log("Add xtype")
         tree.el.attr('xtype', tree['|xns'] + '.' +  tree['xtype']);
         if (!tree.items || !tree.items.length) { return; }