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
/
Editor.js
diff --git
a/src/widgets/Editor.js
b/src/widgets/Editor.js
index
14da542
..
5d53acd
100644
(file)
--- a/
src/widgets/Editor.js
+++ b/
src/widgets/Editor.js
@@
-1,8
+1,8
@@
/*!
/*!
- * Ext JS Library 3.
2.0
- * 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.Editor
*/
/**
* @class Ext.Editor
@@
-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);
}