X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=resources%2Froo.builder.js;h=2163657daada9296502f5d01a5503b5f7f78db8e;hb=bca805c292ae29615ca9649e453407edb960d3d8;hp=d1d5e9ff7a595361fd0093de14aa62809101c216;hpb=64edffa5ec29b1da977487bc1df9a5146fc21fb1;p=app.Builder.js diff --git a/resources/roo.builder.js b/resources/roo.builder.js index d1d5e9ff7..2163657da 100644 --- a/resources/roo.builder.js +++ b/resources/roo.builder.js @@ -314,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']); @@ -331,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); - for (var i = 0; i < tree.items.length; i++){ - this.applyFlexy(tree.items[i]); + //Roo.log("Add xtype") + + + + 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); } + }