Roo/bootstrap/layout/Region.js
authoredward <edward@roojs.com>
Wed, 18 Apr 2018 09:45:41 +0000 (17:45 +0800)
committeredward <edward@roojs.com>
Wed, 18 Apr 2018 09:45:41 +0000 (17:45 +0800)
roojs-bootstrap.js
roojs-bootstrap-debug.js

Roo/bootstrap/layout/Region.js
roojs-bootstrap-debug.js
roojs-bootstrap.js

index a0db851..ef59b64 100644 (file)
@@ -520,21 +520,6 @@ Roo.extend(Roo.bootstrap.layout.Region, Roo.bootstrap.layout.Basic, {
         panel = this.getPanel(panel);
         if(this.activePanel && this.activePanel != panel){
             if(this.activePanel.setActiveState(false) === false){
-                
-                Roo.log(this.activePanel.tabItem);
-                
-                if(this.activePanel.tabItem){
-                    
-                    if(this.activePanel.tabItem.tabPanel.active){
-                        this.activePanel.tabItem.tabPanel.active.pnode.removeClass("active");
-                        this.activePanel.tabItem.tabPanel.active.hideAction();
-                    }
-                    
-                    this.activePanel.tabItem.tabPanel.active = this.activePanel.tabItem;
-                    this.activePanel.tabItem.tabPanel.active.pnode.addClass("active");
-                    this.activePanel.tabItem.tabPanel.active.showAction();
-                }
-                
                 return;
             }
         }
index 71bdf60..308e59f 100644 (file)
@@ -35455,21 +35455,6 @@ Roo.extend(Roo.bootstrap.layout.Region, Roo.bootstrap.layout.Basic, {
         panel = this.getPanel(panel);
         if(this.activePanel && this.activePanel != panel){
             if(this.activePanel.setActiveState(false) === false){
-                
-                Roo.log(this.activePanel.tabItem);
-                
-                if(this.activePanel.tabItem){
-                    
-                    if(this.activePanel.tabItem.tabPanel.active){
-                        this.activePanel.tabItem.tabPanel.active.pnode.removeClass("active");
-                        this.activePanel.tabItem.tabPanel.active.hideAction();
-                    }
-                    
-                    this.activePanel.tabItem.tabPanel.active = this.activePanel.tabItem;
-                    this.activePanel.tabItem.tabPanel.active.pnode.addClass("active");
-                    this.activePanel.tabItem.tabPanel.active.showAction();
-                }
-                
                 return;
             }
         }
index bc0353e..521a2ef 100644 (file)
@@ -1486,17 +1486,16 @@ this.visible=false;this.fireEvent("visibilitychange",this,false);},show:function
 ts.monitorResize=false;ts.bodyEl.addClass('roo-layout-tabs-body');this.panels.each(this.initPanelAsTab,this);},initPanelAsTab:function(A){var ti=this.tabs.addTab(A.getEl().id,A.getTitle(),null,this.config.closeOnTab&&A.isClosable(),A.tpl);if(A.tabTip!==undefined){ti.setTooltip(A.tabTip);
 }ti.on("activate",function(){this.setActivePanel(A);},this);if(this.config.closeOnTab){ti.on("beforeclose",function(t,e){e.cancel=true;this.remove(A);},this);}A.tabItem=ti;return ti;},updatePanelTitle:function(A,B){if(this.activePanel==A){this.updateTitle(B);
 }if(this.tabs){var ti=this.tabs.getTab(A.getEl().id);ti.setText(B);if(A.tabTip!==undefined){ti.setTooltip(A.tabTip);}}},updateTitle:function(A){if(this.titleTextEl&&!this.config.title){this.titleTextEl.innerHTML=(typeof A!="undefined"&&A.length>0?A:"&#160;");
-}},setActivePanel:function(A){A=this.getPanel(A);if(this.activePanel&&this.activePanel!=A){if(this.activePanel.setActiveState(false)===false){Roo.log(this.activePanel.tabItem);if(this.activePanel.tabItem){if(this.activePanel.tabItem.tabPanel.active){this.activePanel.tabItem.tabPanel.active.pnode.removeClass("active");
-this.activePanel.tabItem.tabPanel.active.hideAction();}this.activePanel.tabItem.tabPanel.active=this.activePanel.tabItem;this.activePanel.tabItem.tabPanel.active.pnode.addClass("active");this.activePanel.tabItem.tabPanel.active.showAction();}return;}}this.activePanel=A;
-A.setActiveState(true);if(this.panelSize){A.setSize(this.panelSize.width,this.panelSize.height);}if(this.closeBtn){this.closeBtn.setVisible(!this.config.closeOnTab&&!this.isSlid&&A.isClosable());}this.updateTitle(A.getTitle());if(this.tabs){this.fireEvent("invalidated",this);
-}this.fireEvent("panelactivated",this,A);},showPanel:function(A){A=this.getPanel(A);if(A){if(this.tabs){var B=this.tabs.getTab(A.getEl().id);if(B.isHidden()){this.tabs.unhideTab(B.id);}B.activate();}else{this.setActivePanel(A);}}return A;},getActivePanel:function(){return this.activePanel;
-},validateVisibility:function(){if(this.panels.getCount()<1){this.updateTitle("&#160;");this.closeBtn.hide();this.hide();}else{if(!this.isVisible()){this.show();}}},add:function(A){if(arguments.length>1){for(var i=0,B=arguments.length;i<B;i++){this.add(arguments[i]);
-}return null;}if(!this.bodyEl){this.unrendered_panels.push(A);return A;}if(this.hasPanel(A)){this.showPanel(A);return A;}A.setRegion(this);this.panels.add(A);if(!this.tabs){this.initTabs();}else{this.initPanelAsTab(A);}if(A.background!==true){this.tabs.activate(A.getEl().id);
-}this.fireEvent("paneladded",this,A);return A;},hidePanel:function(A){if(this.tabs&&(A=this.getPanel(A))){this.tabs.hideTab(A.getEl().id);}},unhidePanel:function(A){if(this.tabs&&(A=this.getPanel(A))){this.tabs.unhideTab(A.getEl().id);}},clearPanels:function(){while(this.panels.getCount()>0){this.remove(this.panels.first());
-}},remove:function(A,B){A=this.getPanel(A);if(!A){return null;}var e={};this.fireEvent("beforeremove",this,A,e);if(e.cancel===true){return null;}B=(typeof B!="undefined"?B:(this.config.preservePanels===true||A.preserve===true));var C=A.getId();this.panels.removeKey(C);
-if(B){document.body.appendChild(A.getEl().dom);}if(this.tabs){this.tabs.removeTab(A.getEl().id);}else if(!B){this.bodyEl.dom.removeChild(A.getEl().dom);}if(this.panels.getCount()==1&&this.tabs&&!this.config.alwaysShowTabs){var p=this.panels.first();var D=document.createElement("div");
-D.appendChild(p.getEl().dom);this.bodyEl.update("");this.bodyEl.dom.appendChild(p.getEl().dom);D=null;this.updateTitle(p.getTitle());this.tabs=null;this.bodyEl.setStyle("overflow",this.config.autoScroll?"auto":"hidden");this.setActivePanel(p);}A.setRegion(null);
-if(this.activePanel==A){this.activePanel=null;}if(this.config.autoDestroy!==false&&B!==true){try{A.destroy();}catch(e){}}this.fireEvent("panelremoved",this,A);return A;},getTabs:function(){return this.tabs;},createTool:function(A,B){var C=Roo.DomHelper.append(A,{tag:"div",cls:"x-layout-tools-button",children:[{tag:"div",cls:"roo-layout-tools-button-inner "+B,html:"&#160;"}
+}},setActivePanel:function(A){A=this.getPanel(A);if(this.activePanel&&this.activePanel!=A){if(this.activePanel.setActiveState(false)===false){return;}}this.activePanel=A;A.setActiveState(true);if(this.panelSize){A.setSize(this.panelSize.width,this.panelSize.height);
+}if(this.closeBtn){this.closeBtn.setVisible(!this.config.closeOnTab&&!this.isSlid&&A.isClosable());}this.updateTitle(A.getTitle());if(this.tabs){this.fireEvent("invalidated",this);}this.fireEvent("panelactivated",this,A);},showPanel:function(A){A=this.getPanel(A);
+if(A){if(this.tabs){var B=this.tabs.getTab(A.getEl().id);if(B.isHidden()){this.tabs.unhideTab(B.id);}B.activate();}else{this.setActivePanel(A);}}return A;},getActivePanel:function(){return this.activePanel;},validateVisibility:function(){if(this.panels.getCount()<1){this.updateTitle("&#160;");
+this.closeBtn.hide();this.hide();}else{if(!this.isVisible()){this.show();}}},add:function(A){if(arguments.length>1){for(var i=0,B=arguments.length;i<B;i++){this.add(arguments[i]);}return null;}if(!this.bodyEl){this.unrendered_panels.push(A);return A;}if(this.hasPanel(A)){this.showPanel(A);
+return A;}A.setRegion(this);this.panels.add(A);if(!this.tabs){this.initTabs();}else{this.initPanelAsTab(A);}if(A.background!==true){this.tabs.activate(A.getEl().id);}this.fireEvent("paneladded",this,A);return A;},hidePanel:function(A){if(this.tabs&&(A=this.getPanel(A))){this.tabs.hideTab(A.getEl().id);
+}},unhidePanel:function(A){if(this.tabs&&(A=this.getPanel(A))){this.tabs.unhideTab(A.getEl().id);}},clearPanels:function(){while(this.panels.getCount()>0){this.remove(this.panels.first());}},remove:function(A,B){A=this.getPanel(A);if(!A){return null;}var e={}
+;this.fireEvent("beforeremove",this,A,e);if(e.cancel===true){return null;}B=(typeof B!="undefined"?B:(this.config.preservePanels===true||A.preserve===true));var C=A.getId();this.panels.removeKey(C);if(B){document.body.appendChild(A.getEl().dom);}if(this.tabs){this.tabs.removeTab(A.getEl().id);
+}else if(!B){this.bodyEl.dom.removeChild(A.getEl().dom);}if(this.panels.getCount()==1&&this.tabs&&!this.config.alwaysShowTabs){var p=this.panels.first();var D=document.createElement("div");D.appendChild(p.getEl().dom);this.bodyEl.update("");this.bodyEl.dom.appendChild(p.getEl().dom);
+D=null;this.updateTitle(p.getTitle());this.tabs=null;this.bodyEl.setStyle("overflow",this.config.autoScroll?"auto":"hidden");this.setActivePanel(p);}A.setRegion(null);if(this.activePanel==A){this.activePanel=null;}if(this.config.autoDestroy!==false&&B!==true){try{A.destroy();
+}catch(e){}}this.fireEvent("panelremoved",this,A);return A;},getTabs:function(){return this.tabs;},createTool:function(A,B){var C=Roo.DomHelper.append(A,{tag:"div",cls:"x-layout-tools-button",children:[{tag:"div",cls:"roo-layout-tools-button-inner "+B,html:"&#160;"}
 ]},true);C.addClassOnOver("roo-layout-tools-button-over");return C;}});
 // Roo/bootstrap/layout/Split.js
 Roo.bootstrap.layout.Split=function(A){this.cursor=A.cursor;Roo.bootstrap.layout.Split.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.layout.Split,Roo.bootstrap.layout.Region,{splitTip:"Drag to resize.",collapsibleSplitTip:"Drag to resize. Double click to hide.",useSplitTips:false,applyConfig:function(A){Roo.bootstrap.layout.Split.superclass.applyConfig.call(this,A);