X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=resources%2Froo.builder.js;h=784617187096f9495d6e212e296877b331633636;hb=6c76210cc5db515e551aa856798376ee5c38b91c;hp=87ca95f818b3457a9f102a1582bf4b07611f31bf;hpb=83c4696119ac80a53acafcefc391690a3d97f497;p=app.Builder.js diff --git a/resources/roo.builder.js b/resources/roo.builder.js index 87ca95f81..784617187 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); + //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); } + }