roojs-core.js

roojs-core-debug.js

diff --git a/roojs-core-debug.js b/roojs-core-debug.js
index d9585d6..01e0ec6 100644 (file)
--- a/roojs-core-debug.js
+++ b/roojs-core-debug.js
@@ -15887,9 +15887,8 @@ Roo.extend(Roo.XComponent, Roo.util.Observable, {
                  })
             }
         }
-        Roo.log('xtype');
-        Roo.log(this);
-               if (!this.parent.el || this.xtype == 'Modal') {
+        
+               if (!this.parent.el) {
                        // probably an old style ctor, which has been disabled.
                        return;
                        
@@ -15898,6 +15897,10 @@ Roo.extend(Roo.XComponent, Roo.util.Observable, {
             
         var tree = this._tree ? this._tree() : this.tree();
         tree.region = tree.region || this.region;
+        
+        Roo.log('tree');
+        Roo.log(tree);
+        
         if (this.parent.el === true) {
             // bootstrap... - body..
             this.parent.el = Roo.factory(tree);

diff --git a/roojs-core.js b/roojs-core.js
index d1c00cd..e9bd246 100644 (file)
--- a/roojs-core.js
+++ b/roojs-core.js
@@ -321,8 +321,7 @@ this.onPosition(ax,ay);this.fireEvent('move',this,ax,ay);}return this;},setPageP
 //Roo/XComponent.js
 Roo.XComponent=function(A){Roo.apply(this,A);this.addEvents({'built':true});this.region=this.region||'center';Roo.XComponent.register(this);this.modules=false;this.el=false;}
 Roo.extend(Roo.XComponent,Roo.util.Observable,{el:false,panel:false,layout:false,disabled:false,parent:false,order:false,name:false,region:'center',items:false,_tree:false,render:function(el){el=el||false;var hp=this.parent?1:0;if(!el&&typeof(this.parent)=='string'&&this.parent.substring(0,1)=='#'){var A=this.parent.substr(1)
-this.parent=(this.parent=='#bootstrap')?{el:true}:false;el=Roo.get(A);if(!el&&!this.parent){Roo.log("Warning - element can not be found :#"+A);return;}}if(!this.parent){el=el?Roo.get(el):false;this.parent={el:new Roo.BorderLayout(el||document.body,{center:{titlebar:false,autoScroll:false,closeOnTab:true,tabPosition:'top',alwaysShowTabs:el&&hp?false:true,hideTabs:el||!hp?true:false,minTabWidth:140}})}}
-Roo.log('xtype');Roo.log(this);if(!this.parent.el||this.xtype=='Modal'){return;}var B=this._tree?this._tree():this.tree();B.region=B.region||this.region;if(this.parent.el===true){this.parent.el=Roo.factory(B);}
+this.parent=(this.parent=='#bootstrap')?{el:true}:false;el=Roo.get(A);if(!el&&!this.parent){Roo.log("Warning - element can not be found :#"+A);return;}}if(!this.parent){el=el?Roo.get(el):false;this.parent={el:new Roo.BorderLayout(el||document.body,{center:{titlebar:false,autoScroll:false,closeOnTab:true,tabPosition:'top',alwaysShowTabs:el&&hp?false:true,hideTabs:el||!hp?true:false,minTabWidth:140}})}}if(!this.parent.el){return;}var B=this._tree?this._tree():this.tree();B.region=B.region||this.region;Roo.log('tree');Roo.log(B);if(this.parent.el===true){this.parent.el=Roo.factory(B);}
 this.el=this.parent.el.addxtype(B);this.fireEvent('built',this);this.panel=this.el;this.layout=this.panel.layout;this.parentLayout=this.parent.layout||false;}});Roo.apply(Roo.XComponent,{hideProgress:false,buildCompleted:false,topModule:false,modules:[],elmodules:[],register:function(A){Roo.XComponent.event.fireEvent('register',A);switch(typeof(A.disabled)){case 'undefined':break;case 'function':if(A.disabled()){return;}break;default:if(A.disabled){return;}break;}
 this.modules.push(A);},toObject:function(str){if(!str||typeof(str)=='object'){return str;}if(str.substring(0,1)=='#'){return str;}var ar=str.split('.');var rt,o;rt=ar.shift();try{eval('if (typeof '+rt+' == "undefined"){ o = false;} o = '+rt+';');}catch(e){throw "Module not found : "+str;}if(o===false){throw "Module not found : "+str;}
 Roo.each(ar,function(e){if(typeof(o[e])=='undefined'){throw "Module not found : "+str;}