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

diff --git a/resources/roo.builder.js b/resources/roo.builder.js
index 6fb9ed62e..2163657da 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;
@@ -308,6 +314,9 @@ Builder  = {
     
     applyFlexy: function(tree)
     {
+        if (!tree.el) {
+            return;
+        }
         if (typeof(tree['flexy:foreach']) != 'undefined') {
             //Roo.log("add flexy:foreach");
             tree.el.attr('flexy:foreach', tree['flexy:foreach']);
@@ -325,13 +334,28 @@ Builder  = {
             //Roo.log("add flexy:if");
             tree.el.attr('flexy:include', tree['flexy:include']);
         }
-        Roo.log("Add xtype")
+        
+        if (typeof(tree['flexy:ignore']) != 'undefined') {
+            //Roo.log("add flexy:if");
+            tree.el.attr('flexy:ignore', tree['flexy:ignore']);
+        }
+        
         tree.el.attr('xtype', tree['|xns'] + '.' +  tree['xtype']);
-        if (!tree.items || !tree.items.length) { return; }
+        Roo.log(tree);
+        //Roo.log("Add xtype")
         
-        for (var i = 0; i < tree.items.length; i++){
-            this.applyFlexy(tree.items[i]);
+        
+        
+        if (tree.items && tree.items.length > 0) { 
+        //Roo.log(tree);
+            for (var i = 0; i < tree.items.length; i++){
+                this.applyFlexy(tree.items[i]);
+            }
         }
+        if (typeof(tree.menu) == 'object') {
+            this.applyFlexy(tree.menu);
+        }
+        
     }