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]
/
docs
/
source
/
MessageBox.html
diff --git
a/docs/source/MessageBox.html
b/docs/source/MessageBox.html
index
d7d06fa
..
8f50304
100644
(file)
--- a/
docs/source/MessageBox.html
+++ b/
docs/source/MessageBox.html
@@
-7,7
+7,7
@@
</head>
<body onload="prettyPrint();">
<pre class="prettyprint lang-js">/*!
</head>
<body onload="prettyPrint();">
<pre class="prettyprint lang-js">/*!
- * Ext JS Library 3.
2.2
+ * 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
@@
-189,7
+189,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'),
@@
-197,11
+198,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));
@@
-214,6
+210,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;
},