Roo/bootstrap/panel/Tabs.js

roojs-bootstrap.js
roojs-bootstrap-debug.js

diff --git a/Roo/bootstrap/panel/Tabs.js b/Roo/bootstrap/panel/Tabs.js
index b5cb8d1..c79d9d9 100644 (file)
--- a/Roo/bootstrap/panel/Tabs.js
+++ b/Roo/bootstrap/panel/Tabs.js
@@ -539,7 +539,7 @@ Roo.extend(Roo.bootstrap.panel.Tabs, Roo.util.Observable, {
                     break;
             }
             
-            var el = this.tabTpl.overwrite(td, {"text": text});
+            var el = template.overwrite(td, {"text": text});
             
             var inner = el.getElementsByTagName("span")[0];
             return {"el": el, "inner": inner};

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index c838216..f78c0d4 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -35649,37 +35649,88 @@ Roo.extend(Roo.bootstrap.panel.Tabs, Roo.util.Observable, {
         } else {
         */
         // not sure what this is..
-            if(!this.tabTpl){
+//            if(!this.tabTpl){
                 //this.tabTpl = new Roo.Template(
                 //   '<a href="#" class="x-tabs-right"><span class="x-tabs-left"><em class="x-tabs-inner">' +
                 //   '<span unselectable="on"' + (this.disableTooltips ? '' : ' title="{text}"') +' class="x-tabs-text">{text}</span></em></span></a>'
                 //);
-                this.tabTpl = new Roo.Template(
+//                this.tabTpl = new Roo.Template(
+//                   '<a href="#">' +
+//                   '<span unselectable="on"' +
+//                            (this.disableTooltips ? '' : ' title="{text}"') +
+//                            ' >{text}</span></a>'
+//                );
+//                
+//            }
+
+
+            var template = tpl || this.tabTpl || false;
+            
+            if(!template){
+                
+                template = new Roo.Template(
                    '<a href="#">' +
                    '<span unselectable="on"' +
                             (this.disableTooltips ? '' : ' title="{text}"') +
                             ' >{text}</span></a>'
                 );
-                
             }
             
-            if(tpl){
-                switch (typeof(tpl)) {
-                    case 'object' :
-                        this.tabTpl = tpl;
-                        break;
-                    case 'string' :
-                        this.tabTpl = new Roo.Template(tpl);
-                        break;
-                    default :
-                        break;
-                }
+            switch (typeof(template)) {
+                case 'object' :
+                    break;
+                case 'string' :
+                    template = new Roo.Template(template);
+                    break;
+                default :
+                    break;
             }
             
-            var el = this.tabTpl.overwrite(td, {"text": text});
+            var el = template.overwrite(td, {"text": text});
             
             var inner = el.getElementsByTagName("span")[0];
             return {"el": el, "inner": inner};
+            
+            
+//            if(this.tabTpl){
+//                el = this.tabTpl.overwrite(td, {"text": text});
+//            } else {
+//                el = new Roo.Template(
+//                   '<a href="#">' +
+//                   '<span unselectable="on"' +
+//                            (this.disableTooltips ? '' : ' title="{text}"') +
+//                            ' >{text}</span></a>'
+//                );
+//            }
+//            
+//            if(!this.tabTpl){
+//                
+//                this.tabTpl = new Roo.Template(
+//                   '<a href="#">' +
+//                   '<span unselectable="on"' +
+//                            (this.disableTooltips ? '' : ' title="{text}"') +
+//                            ' >{text}</span></a>'
+//                );
+//                
+//            }
+//            
+//            if(tpl){
+//                switch (typeof(tpl)) {
+//                    case 'object' :
+//                        this.tabTpl = tpl;
+//                        break;
+//                    case 'string' :
+//                        this.tabTpl = new Roo.Template(tpl);
+//                        break;
+//                    default :
+//                        break;
+//                }
+//            }
+//            
+//            var el = this.tabTpl.overwrite(td, {"text": text});
+//            
+//            var inner = el.getElementsByTagName("span")[0];
+//            return {"el": el, "inner": inner};
         //}
     }
         

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index eeef6e9..2d499b1 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -1490,8 +1490,8 @@ this.setTabWidth(Math.max(C,this.minTabWidth)-2);if(C<this.minTabWidth){}}else{i
 for(var i=0,B=this.items.length;i<B;i++){if(!this.items[i].isHidden()){this.items[i].setWidth(A);}}},destroy:function(A){Roo.EventManager.removeResizeListener(this.onResize,this);for(var i=0,B=this.items.length;i<B;i++){this.items[i].purgeListeners();}if(A===true){this.el.update("");
 this.el.remove();}},createStrip:function(A){var B=document.createElement("nav");B.className="navbar navbar-default";A.appendChild(B);return B;},createStripList:function(A){A.innerHTML='<ul class="nav nav-tabs" role="tablist"></ul>';return A.firstChild;},createBody:function(A){var B=document.createElement("div");
 Roo.id(B,"tab-body");Roo.fly(B).addClass("tab-content");A.appendChild(B);return B;},createItemBody:function(A,id){var B=Roo.getDom(id);if(!B){B=document.createElement("div");B.id=id;}Roo.fly(B).addClass("tab-pane");A.insertBefore(B,A.firstChild);return B;
-},createStripElements:function(A,B,C,D){var td=document.createElement("li");A.appendChild(td);if(!this.tabTpl){this.tabTpl=new Roo.Template('<a href="#">'+'<span unselectable="on"'+(this.disableTooltips?'':' title="{text}"')+' >{text}</span></a>');}if(D){switch(typeof(D)){case 'object':this.tabTpl=D;
-break;case 'string':this.tabTpl=new Roo.Template(D);break;default:break;}}var el=this.tabTpl.overwrite(td,{"text":B});var E=el.getElementsByTagName("span")[0];return {"el":el,"inner":E};}});
+},createStripElements:function(A,B,C,D){var td=document.createElement("li");A.appendChild(td);var E=D||this.tabTpl||false;if(!E){E=new Roo.Template('<a href="#">'+'<span unselectable="on"'+(this.disableTooltips?'':' title="{text}"')+' >{text}</span></a>');
+}switch(typeof(E)){case 'object':break;case 'string':E=new Roo.Template(E);break;default:break;}var el=E.overwrite(td,{"text":B});var F=el.getElementsByTagName("span")[0];return {"el":el,"inner":F};}});
 // Roo/bootstrap/panel/TabItem.js
 Roo.bootstrap.panel.TabItem=function(A){this.tabPanel=A.panel;this.id=A.id;this.disabled=false;this.text=A.text;this.loaded=false;this.closable=A.closable;this.bodyEl=Roo.get(this.tabPanel.createItemBody(this.tabPanel.bodyEl.dom,A.id));this.bodyEl.setVisibilityMode(Roo.Element.VISIBILITY);
 this.bodyEl.setStyle("display","block");this.bodyEl.setStyle("zoom","1");var B=this.tabPanel.createStripElements(this.tabPanel.stripEl.dom,A.text,A.closable,A.tpl);this.el=Roo.get(B.el);this.inner=Roo.get(B.inner,true);this.textEl=Roo.get(this.el.dom.firstChild,true);