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.2.2 - Released 06/02/2010
[extjs.git]
/
src
/
widgets
/
Editor.js
diff --git
a/src/widgets/Editor.js
b/src/widgets/Editor.js
index
14e685d
..
8cc1c64
100644
(file)
--- a/
src/widgets/Editor.js
+++ b/
src/widgets/Editor.js
@@
-1,5
+1,5
@@
/*!
/*!
- * Ext JS Library 3.2.
1
+ * Ext JS Library 3.2.
2
* 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
@@
-265,7
+265,8
@@
Ext.extend(Ext.Editor, Ext.Component, {
delete this.field.lastSize;
this.field.setSize(w, h);
if(this.el){
delete this.field.lastSize;
this.field.setSize(w, h);
if(this.el){
- if(Ext.isGecko2 || Ext.isOpera){
+ // IE7 in strict mode doesn't size properly.
+ if(Ext.isGecko2 || Ext.isOpera || (Ext.isIE7 && Ext.isStrict)){
// prevent layer scrollbars
this.el.setSize(w, h);
}
// prevent layer scrollbars
this.el.setSize(w, h);
}