X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=resources%2Froo.builder.js;h=59ffc80b0638199f236f2f3ceb6dc2831cc04763;hb=e857bf502efa8e8b2a3962c06fc5130b37c4d52b;hp=720639820665ea1d8f4522de2cc5eed33b0d6aa5;hpb=74f8eed243f123e85c22c6087b49d5e2bdcde4e9;p=app.Builder.js
diff --git a/resources/roo.builder.js b/resources/roo.builder.js
index 720639820..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/)) {
+ //console.log(currentElement);
+ if (currentElement.className && currentElement.className.match(/roo-dynamic/)) {
return;
}
@@ -54,6 +54,9 @@ Builder = {
return;
}
+ if (nodeName.match(/^#/)) { // comments?
+ return;
+ }
@@ -62,8 +65,13 @@ Builder = {
return;
}
if (nodeName != 'BODY') {
-
-
+ //Roo.log(currentElement);
+ if (currentElement.hasAttribute('flexy:include')) {
+
+
+ cb( '');
+ return;
+ }
var i = 0;
// Prints the node tagName, such as , , etc
@@ -90,9 +98,7 @@ Builder = {
} else {
tagName = false;
}
- if (currentElement.hasAttribute('flexy:include')) {
- cb( tagName ? ""+tagName+">" : '');
- }
+
// Traverse the tree
i = 0;
@@ -278,7 +284,7 @@ Builder = {
}
id = ''+ id;
var bid = id.length ? 'builder-' + id : '';
- console.log('{ "hover-node" : "' + bid + '"}');
+ //console.log('{ "hover-node" : "' + bid + '"}');
this.lastID = id;
},
clearBootstrap : function()
@@ -326,12 +332,25 @@ Builder = {
tree.el.attr('flexy:include', tree['flexy:include']);
}
+ 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);
+ }
+
}