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]
/
src
/
widgets
/
MessageBox.js
diff --git
a/src/widgets/MessageBox.js
b/src/widgets/MessageBox.js
index
97fc826
..
3bacf1e
100644
(file)
--- a/
src/widgets/MessageBox.js
+++ b/
src/widgets/MessageBox.js
@@
-1,8
+1,8
@@
/*!
/*!
- * Ext JS Library 3.
2.2
- * Copyright(c) 2006-2010
Ext JS,
Inc.
- * 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.MessageBox
*/
/**
* @class Ext.MessageBox
@@
-181,7
+181,8
@@
Ext.MessageBox = function(){
if(!dlg.isVisible() && !opt.width){
dlg.setSize(this.maxWidth, 100); // resize first so content is never clipped from previous shows
}
if(!dlg.isVisible() && !opt.width){
dlg.setSize(this.maxWidth, 100); // resize first so content is never clipped from previous shows
}
- msgEl.update(text || ' ');
+ // Append a space here for sizing. In IE, for some reason, it wraps text incorrectly without one in some cases
+ msgEl.update(text ? text + ' ' : ' ');
var iw = iconCls != '' ? (iconEl.getWidth() + iconEl.getMargins('lr')) : 0,
mw = msgEl.getWidth() + msgEl.getMargins('lr'),
var iw = iconCls != '' ? (iconEl.getWidth() + iconEl.getMargins('lr')) : 0,
mw = msgEl.getWidth() + msgEl.getMargins('lr'),
@@
-189,11
+190,6
@@
Ext.MessageBox = function(){
bw = dlg.body.getFrameWidth('lr'),
w;
bw = dlg.body.getFrameWidth('lr'),
w;
- if (Ext.isIE && iw > 0){
- //3 pixels get subtracted in the icon CSS for an IE margin issue,
- //so we have to add it back here for the overall width to be consistent
- iw += 3;
- }
w = Math.max(Math.min(opt.width || iw+mw+fw+bw, opt.maxWidth || this.maxWidth),
Math.max(opt.minWidth || this.minWidth, bwidth || 0));
w = Math.max(Math.min(opt.width || iw+mw+fw+bw, opt.maxWidth || this.maxWidth),
Math.max(opt.minWidth || this.minWidth, bwidth || 0));
@@
-206,6
+202,7
@@
Ext.MessageBox = function(){
if(Ext.isIE && w == bwidth){
w += 4; //Add offset when the content width is smaller than the buttons.
}
if(Ext.isIE && w == bwidth){
w += 4; //Add offset when the content width is smaller than the buttons.
}
+ msgEl.update(text || ' ');
dlg.setSize(w, 'auto').center();
return this;
},
dlg.setSize(w, 'auto').center();
return this;
},