Makefile.am

[app.Builder.js] / builder.html.js

diff --git a/builder.html.js b/builder.html.js
index 3bab256..ec722e5 100644 (file)
--- a/builder.html.js
+++ b/builder.html.js
@@ -14,6 +14,9 @@ Builder  = {
     
     render : function(data, clsname)
     {
+        
+       // console.log(data);
+        console.log(clsname);
         // for debugging 
         // console.log(data);        return; 
         //Roo.log(data);
@@ -28,7 +31,7 @@ Builder  = {
         // next.. we need to ensure that parent is set correctly..
         // done by sender... otherwise building becomes difficult..
         //data  += "\n" + 'Builder.' + ix + ".parent = '#renderel';\n";
-        
+        console.log(data);
         //Roo.log(data);return;
         //Roo.log(data);
         if (this.scriptTag) { 
@@ -561,17 +564,12 @@ Builder  = {
     {
         // if the page is not bootstrap
         
-        if ( Roo.XComponent.modules &&
-            Roo.XComponent.modules.length &&
-            Roo.XComponent.modules[0]._tree().xns &&
-            typeof(Roo.bootstrap) !='undefined' &&
-            Roo.XComponent.modules[0]._tree().xns == Roo.bootstrap
-            ) {
-            Roo.log("it's boostrap");
+        if ( typeof(BuilderUseBootstrap) != 'undefined' ) {
+            Roo.log("it's boostrap - BuilderUseBootstrap is defined ");
             // it's bootstrap - probably remove roo's css..
             return;
         }
-        Roo.log("remove css");
+        Roo.log("remove css = BuilderUseBootstrap is not defined");
         var rem = [];
         var ar = document.getElementsByTagName('link');
         for (var i = 0; i < ar.length;i++) {
@@ -597,6 +595,11 @@ Builder  = {
             //Roo.log("add flexy:if");
             tree.el.attr('flexy:if', tree['flexy:if']);
         }
+        if (typeof(tree['flexy:include']) != 'undefined') {
+            //Roo.log("add flexy:if");
+            tree.el.attr('flexy:include', tree['flexy:include']);
+        }
+        
         if (typeof(tree['xtype-bootstrap']) != 'undefined') {
             //Roo.log("add flexy:if");
             tree.el.attr('xtype', tree['xtype-bootstrap']);