git.ithinksw.org
/
extjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to ExtJS 3.3.0 - Released 10/06/2010
[extjs.git]
/
src
/
widgets
/
TabPanel.js
diff --git
a/src/widgets/TabPanel.js
b/src/widgets/TabPanel.js
index
bb69777
..
5ce4981
100644
(file)
--- a/
src/widgets/TabPanel.js
+++ b/
src/widgets/TabPanel.js
@@
-1,5
+1,5
@@
/*!
/*!
- * Ext JS Library 3.
2.1
+ * Ext JS Library 3.
3.0
* Copyright(c) 2006-2010 Ext JS, Inc.
* licensing@extjs.com
* http://www.extjs.com/license
* Copyright(c) 2006-2010 Ext JS, Inc.
* licensing@extjs.com
* http://www.extjs.com/license
@@
-740,13
+740,14
@@
new Ext.TabPanel({
// private
delegateUpdates : function(){
// private
delegateUpdates : function(){
+ var rendered = this.rendered;
if(this.suspendUpdates){
return;
}
if(this.suspendUpdates){
return;
}
- if(this.resizeTabs &&
this.
rendered){
+ if(this.resizeTabs && rendered){
this.autoSizeTabs();
}
this.autoSizeTabs();
}
- if(this.enableTabScroll &&
this.
rendered){
+ if(this.enableTabScroll && rendered){
this.autoScrollTabs();
}
},
this.autoScrollTabs();
}
},
@@
-821,6
+822,8
@@
new Ext.TabPanel({
this.stack.add(item);
this.layout.setActiveItem(item);
this.stack.add(item);
this.layout.setActiveItem(item);
+ // Need to do this here, since setting the active tab slightly changes the size
+ this.delegateUpdates();
if(this.scrolling){
this.scrollToTab(item, this.animScroll);
}
if(this.scrolling){
this.scrollToTab(item, this.animScroll);
}
@@
-860,10
+863,11
@@
new Ext.TabPanel({
pos = this.getScrollPos(),
l = this.edge.getOffsetsTo(this.stripWrap)[0] + pos;
pos = this.getScrollPos(),
l = this.edge.getOffsetsTo(this.stripWrap)[0] + pos;
- if(!this.enableTabScroll || c
ount < 1 || c
w < 20){ // 20 to prevent display:none issues
+ if(!this.enableTabScroll || cw < 20){ // 20 to prevent display:none issues
return;
}
return;
}
- if(l <= tw){
+ if(count == 0 || l <= tw){
+ // ensure the width is set if there's no tabs
wd.scrollLeft = 0;
wrap.setWidth(tw);
if(this.scrolling){
wd.scrollLeft = 0;
wrap.setWidth(tw);
if(this.scrolling){