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.1 - Released 11/30/2010
[extjs.git]
/
pkgs
/
pkg-tabs-debug.js
diff --git
a/pkgs/pkg-tabs-debug.js
b/pkgs/pkg-tabs-debug.js
index
d393f7f
..
712f65f
100644
(file)
--- a/
pkgs/pkg-tabs-debug.js
+++ b/
pkgs/pkg-tabs-debug.js
@@
-1,8
+1,8
@@
/*!
/*!
- * Ext JS Library 3.
1
.1
- * Copyright(c) 2006-2010
Ext JS, LLC
- * licensing@
extjs
.com
- * http://www.
extjs
.com/license
+ * Ext JS Library 3.
3
.1
+ * Copyright(c) 2006-2010
Sencha Inc.
+ * licensing@
sencha
.com
+ * http://www.
sencha
.com/license
*/
/**
* @class Ext.TabPanel
*/
/**
* @class Ext.TabPanel
@@
-559,7
+559,7
@@
new Ext.TabPanel({
* <li><b>cls</b> : String<div class="sub-desc">The CSS class name</div></li>
* <li><b>iconCls</b> : String<div class="sub-desc">A CSS class to provide appearance for an icon.</div></li>
* </ul></div>
* <li><b>cls</b> : String<div class="sub-desc">The CSS class name</div></li>
* <li><b>iconCls</b> : String<div class="sub-desc">A CSS class to provide appearance for an icon.</div></li>
* </ul></div>
- * @param {BoxComponent} item The {@link Ext.BoxComponent BoxComponent} for which to create a selector element in the tab strip.
+ * @param {
Ext.
BoxComponent} item The {@link Ext.BoxComponent BoxComponent} for which to create a selector element in the tab strip.
* @return {Object} An object hash containing the properties required to render the selector element.
*/
getTemplateArgs : function(item) {
* @return {Object} An object hash containing the properties required to render the selector element.
*/
getTemplateArgs : function(item) {
@@
-588,9
+588,6
@@
new Ext.TabPanel({
if(this.rendered){
var items = this.items;
this.initTab(c, items.indexOf(c));
if(this.rendered){
var items = this.items;
this.initTab(c, items.indexOf(c));
- if(items.getCount() == 1){
- this.syncSize();
- }
this.delegateUpdates();
}
},
this.delegateUpdates();
}
},
@@
-743,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();
}
},
@@
-817,13
+815,15
@@
new Ext.TabPanel({
Ext.fly(oldEl).removeClass('x-tab-strip-active');
}
}
Ext.fly(oldEl).removeClass('x-tab-strip-active');
}
}
+ this.activeTab = item;
if(item){
var el = this.getTabEl(item);
Ext.fly(el).addClass('x-tab-strip-active');
if(item){
var el = this.getTabEl(item);
Ext.fly(el).addClass('x-tab-strip-active');
- this.activeTab = item;
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);
}
@@
-863,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){