X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=resources%2Froo.builder.js;h=59ffc80b0638199f236f2f3ceb6dc2831cc04763;hb=e857bf502efa8e8b2a3962c06fc5130b37c4d52b;hp=60785735046d6adb941a5ab719ae6c9219562078;hpb=54cad393297c8cad191b7675e18b971f419a2119;p=app.Builder.js diff --git a/resources/roo.builder.js b/resources/roo.builder.js index 607857350..59ffc80b0 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,7 +65,7 @@ Builder = { return; } if (nodeName != 'BODY') { - + //Roo.log(currentElement); if (currentElement.hasAttribute('flexy:include')) { @@ -328,13 +331,26 @@ 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']); + } + + //Roo.log("Add xtype") tree.el.attr('xtype', tree['|xns'] + '.' + tree['xtype']); - if (!tree.items || !tree.items.length) { return; } - 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); + } + }