projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
roojs-core.js
[roojs1]
/
Roo
/
TabPanel.js
diff --git
a/Roo/TabPanel.js
b/Roo/TabPanel.js
index
a7e9ea0
..
e702b2f
100644
(file)
--- a/
Roo/TabPanel.js
+++ b/
Roo/TabPanel.js
@@
-109,8
+109,13
@@
Roo.TabPanel = function(container, config){
// toolbar on the tabbar support...
if (this.toolbar) {
var tcfg = this.toolbar;
// toolbar on the tabbar support...
if (this.toolbar) {
var tcfg = this.toolbar;
- tcfg.container = this.stripEl.child('td.x-tab-strip-toolbar');
//createChild( { tag: 'td', style: 'width:100%;' });
+ tcfg.container = this.stripEl.child('td.x-tab-strip-toolbar');
this.toolbar = new Roo.Toolbar(tcfg);
this.toolbar = new Roo.Toolbar(tcfg);
+ if (Roo.isSafari) {
+ var tbl = tcfg.container.child('table', true);
+ tbl.setAttribute('width', '100%');
+ }
+
}
}
@@
-361,7
+366,9
@@
Roo.extend(Roo.TabPanel, Roo.util.Observable, {
autoSizeTabs : function(){
var count = this.items.length;
var vcount = count - this.hiddenCount;
autoSizeTabs : function(){
var count = this.items.length;
var vcount = count - this.hiddenCount;
- if(!this.resizeTabs || count < 1 || vcount < 1 || this.updating) return;
+ if(!this.resizeTabs || count < 1 || vcount < 1 || this.updating) {
+ return;
+ }
var w = Math.max(this.el.getWidth() - this.cpad, 10);
var availWidth = Math.floor(w / vcount);
var b = this.stripBody;
var w = Math.max(this.el.getWidth() - this.cpad, 10);
var availWidth = Math.floor(w / vcount);
var b = this.stripBody;
@@
-397,7
+404,9
@@
Roo.extend(Roo.TabPanel, Roo.util.Observable, {
setTabWidth : function(width){
this.currentTabWidth = width;
for(var i = 0, len = this.items.length; i < len; i++) {
setTabWidth : function(width){
this.currentTabWidth = width;
for(var i = 0, len = this.items.length; i < len; i++) {
- if(!this.items[i].isHidden())this.items[i].setWidth(width);
+ if(!this.items[i].isHidden()) {
+ this.items[i].setWidth(width);
+ }
}
},
}
},
@@
-615,7
+624,11
@@
Roo.extend(Roo.TabPanelItem, Roo.util.Observable, {
autoSize : function(){
//this.el.beginMeasure();
this.textEl.setWidth(1);
autoSize : function(){
//this.el.beginMeasure();
this.textEl.setWidth(1);
- this.setWidth(this.textEl.dom.scrollWidth+this.pnode.getPadding("lr")+this.inner.getPadding("lr"));
+ /*
+ * #2804 [new] Tabs in Roojs
+ * increase the width by 2-4 pixels to prevent the ellipssis showing in chrome
+ */
+ this.setWidth(this.textEl.dom.scrollWidth+this.pnode.getPadding("lr")+this.inner.getPadding("lr") + 2);
//this.el.endMeasure();
},
//this.el.endMeasure();
},