X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=resources%2Froo.builder.js;h=2163657daada9296502f5d01a5503b5f7f78db8e;hb=bca805c292ae29615ca9649e453407edb960d3d8;hp=711499507085d0b31e9bc8c8de2a46ba60a72f22;hpb=07ef766cca65aa5705fa32aedb2c77b8591ca48b;p=app.Builder.js diff --git a/resources/roo.builder.js b/resources/roo.builder.js index 711499507..2163657da 100644 --- a/resources/roo.builder.js +++ b/resources/roo.builder.js @@ -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')) { @@ -311,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']); @@ -328,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); } + }