X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=resources%2Froo.builder.js;h=bf08085d2ecf627b43a7ddd80dcf7b0ba0532b76;hb=ea6cbc738a355fb441b4b7025e13a0679f9b5bd7;hp=1a52c2e246dcfe2e928e512a01444683276d7413;hpb=5a9cdc9fbf89cd24fbbce4a82ca08ae9ef15cf52;p=app.Builder.js
diff --git a/resources/roo.builder.js b/resources/roo.builder.js
index 1a52c2e24..bf08085d2 100644
--- a/resources/roo.builder.js
+++ b/resources/roo.builder.js
@@ -17,7 +17,7 @@ Builder = {
- saveHTML : function( )
+ saveHTML : function( )
{
//print("TRAVERSE DOM?");
@@ -25,19 +25,22 @@ Builder = {
//print(dom);
var ret = '';
//Roo.select('body > div',true).each(function(el) {
+ // if the tree is not ready yet?
+
+
this.traverseDOMTree(function(s) { ret+=s; }, dom, 1);
- alert("IPC:SAVEHTML:" + dom);
+ alert("IPC:SAVEHTML:" + ret);
return ret;
},
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;
}
@@ -51,6 +54,9 @@ Builder = {
return;
}
+ if (nodeName.match(/^#/)) { // comments?
+ return;
+ }
@@ -59,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
@@ -87,6 +98,8 @@ Builder = {
} else {
tagName = false;
}
+
+
// Traverse the tree
i = 0;
var currentElementChild = currentElement.childNodes.item(i);
@@ -271,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()
@@ -314,7 +327,12 @@ Builder = {
tree.el.attr('xtype', tree['xtype-bootstrap']);
}
-
+ if (typeof(tree['flexy:include']) != 'undefined') {
+ //Roo.log("add flexy:if");
+ tree.el.attr('flexy:include', tree['flexy:include']);
+ }
+ //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++){
@@ -328,6 +346,8 @@ Builder = {
Roo.onReady(function() { Builder.clearBootstrap(); });
Roo.XComponent.on('buildcomplete', function() {
Roo.log("xcomponent built!");
+ var m = Roo.XComponent.modules;
+ Builder.applyFlexy(m[m.length-1].el);
- Builder.applyFlexy(Roo.XComponent.modules[0].el);
+ Builder.saveHTML.defer(100, Builder);
});
\ No newline at end of file