X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=resources%2Froo.builder.js;h=a53f114afc92243b84185d2071d73cab282743a8;hb=794256fdeb19d2a1930233c73025282964f124e8;hp=295b1da33b3f3667b703e9dcaaf992ea1a858dc0;hpb=15c8f4bbcdbc02136f7e07ddbd84b7b0cbdf00c2;p=app.Builder.js diff --git a/resources/roo.builder.js b/resources/roo.builder.js index 295b1da33..a53f114af 100644 --- a/resources/roo.builder.js +++ b/resources/roo.builder.js @@ -78,15 +78,17 @@ Builder = { if (tagName) { var attr = []; for(i = 0; i < currentElement.attributes.length;i++) { - var aname = currentElement.attributes.item(i).name; - if (aname=='id') { + var attre = currentElement.attributes.item(i); + var aname = attre.name; + var aval = attre.value || ''; + if (aname=='id' && aval.match(/^roo\-/)) { // only roo -elements hide.. aname= 'xbuilderid'; } - // skip - if (currentElement.attributes.item(i).value == 'builderel') { + // skip -- component created by the builder? + if (aval == 'builderel') { return; } - attr.push(aname + '="' + currentElement.attributes.item(i).value + '"' ); + attr.push(aname + '="' + aval + '"' ); //?? escaping attributes? } @@ -314,6 +316,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']); @@ -337,11 +342,13 @@ Builder = { tree.el.attr('flexy:ignore', tree['flexy:ignore']); } - //Roo.log("Add xtype") tree.el.attr('xtype', tree['|xns'] + '.' + tree['xtype']); + //Roo.log(tree); + //Roo.log("Add xtype") + - if (tree.items && !tree.items.length) { + if (tree.items && tree.items.length > 0) { //Roo.log(tree); for (var i = 0; i < tree.items.length; i++){ this.applyFlexy(tree.items[i]); @@ -351,7 +358,6 @@ Builder = { this.applyFlexy(tree.menu); } - }