roojs-core.js

[roojs1] / roojs-core-debug.js

diff --git a/roojs-core-debug.js b/roojs-core-debug.js
index fdd6dd7..9ad05ed 100644 (file)
--- a/roojs-core-debug.js
+++ b/roojs-core-debug.js
@@ -16038,7 +16038,6 @@ Roo.extend(Roo.XComponent, Roo.util.Observable, {
         Roo.debug &&  Roo.log(this);
         
         var tree = this._tree ? this._tree() : this.tree();
-        var named_el = false;
 
         
         if (!el && typeof(this.parent) == 'string' && this.parent.substring(0,1) == '#') {
@@ -16046,7 +16045,6 @@ Roo.extend(Roo.XComponent, Roo.util.Observable, {
             var ename = this.parent.substr(1);
             this.parent = false;
             Roo.debug && Roo.log(ename);
-            named_el = true;
             switch (ename) {
                 case 'bootstrap-body':
                     if (typeof(tree.el) != 'undefined' && tree.el == document.body)  {
@@ -16076,7 +16074,7 @@ Roo.extend(Roo.XComponent, Roo.util.Observable, {
                          break;
                     }
                          
-                    if (typeof(Roo.bootstrap.Body) != 'undefined') {
+                    if (typeof(Roo.bootstrap.Body) != 'undefined' ) {
                         this.parent = { el :  new  Roo.bootstrap.Body() };
                         Roo.debug && Roo.log("setting el to doc body");
                          
@@ -16089,7 +16087,10 @@ Roo.extend(Roo.XComponent, Roo.util.Observable, {
                     // fall through
                 default:
                     el = Roo.get(ename);
-                     
+                    if (typeof(Roo.bootstrap) != 'undefined' && tree['|xns'] == 'Roo.bootstrap') {
+                        this.parent = { el : true};
+                    }
+                    
                     break;
             }
                 
@@ -16114,7 +16115,7 @@ Roo.extend(Roo.XComponent, Roo.util.Observable, {
         
         
         
-        if (!this.parent && is_alt && !named_el) {
+        if (!this.parent && is_alt) {
             //el = Roo.get(document.body);
             this.parent = { el : true };
         }
@@ -16134,15 +16135,15 @@ Roo.extend(Roo.XComponent, Roo.util.Observable, {
                         el: el || document.body,
                     
                         center: {
-                             titlebar: false,
-                             autoScroll:false,
-                             closeOnTab: true,
-                             tabPosition: 'top',
-                              //resizeTabs: true,
-                             alwaysShowTabs: false,
-                             hideTabs: true,
-                             minTabWidth: 140,
-                             overflow: 'visible'
+                            titlebar: false,
+                            autoScroll:false,
+                            closeOnTab: true,
+                            tabPosition: 'top',
+                             //resizeTabs: true,
+                            alwaysShowTabs: false,
+                            hideTabs: true,
+                            minTabWidth: 140,
+                            overflow: 'visible'
                          }
                      })
                 };
@@ -16151,18 +16152,17 @@ Roo.extend(Roo.XComponent, Roo.util.Observable, {
                 // it's a top level one..
                 this.parent =  {
                     el : new Roo.BorderLayout(el || document.body, {
-                    
-                         center: {
-                             titlebar: false,
-                             autoScroll:false,
-                             closeOnTab: true,
-                             tabPosition: 'top',
-                              //resizeTabs: true,
-                             alwaysShowTabs: el && hp? false :  true,
-                             hideTabs: el || !hp ? true :  false,
-                             minTabWidth: 140
+                        center: {
+                            titlebar: false,
+                            autoScroll:false,
+                            closeOnTab: true,
+                            tabPosition: 'top',
+                             //resizeTabs: true,
+                            alwaysShowTabs: el && hp? false :  true,
+                            hideTabs: el || !hp ? true :  false,
+                            minTabWidth: 140
                          }
-                     })
+                    })
                 };
             }
         }
@@ -16178,6 +16178,9 @@ Roo.extend(Roo.XComponent, Roo.util.Observable, {
         var is_body = false;
         if (this.parent.el === true) {
             // bootstrap... - body..
+            if (el) {
+                tree.el = el;
+            }
             this.parent.el = Roo.factory(tree);
             is_body = true;
         }