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.1 - Released 04/27/2010
[extjs.git]
/
src
/
widgets
/
form
/
TriggerField.js
diff --git
a/src/widgets/form/TriggerField.js
b/src/widgets/form/TriggerField.js
index
2a948e4
..
61f1c3e
100644
(file)
--- a/
src/widgets/form/TriggerField.js
+++ b/
src/widgets/form/TriggerField.js
@@
-1,6
+1,6
@@
/*!
/*!
- * Ext JS Library 3.
1.0
- * Copyright(c) 2006-20
09 Ext JS, LLC
+ * Ext JS Library 3.
2.1
+ * Copyright(c) 2006-20
10 Ext JS, Inc.
* licensing@extjs.com
* http://www.extjs.com/license
*/
* licensing@extjs.com
* http://www.extjs.com/license
*/
@@
-83,8
+83,6
@@
Ext.form.TriggerField = Ext.extend(Ext.form.TextField, {
actionMode: 'wrap',
actionMode: 'wrap',
- removeMode: 'container',
-
defaultTriggerWidth: 17,
// private
defaultTriggerWidth: 17,
// private
@@
-99,7
+97,7
@@
Ext.form.TriggerField = Ext.extend(Ext.form.TextField, {
getTriggerWidth: function(){
var tw = this.trigger.getWidth();
getTriggerWidth: function(){
var tw = this.trigger.getWidth();
- if(!this.hideTrigger && tw === 0){
+ if(!this.hideTrigger &&
!this.readOnly &&
tw === 0){
tw = this.defaultTriggerWidth;
}
return tw;
tw = this.defaultTriggerWidth;
}
return tw;
@@
-125,7
+123,10
@@
Ext.form.TriggerField = Ext.extend(Ext.form.TextField, {
this.wrap.setWidth(this.el.getWidth()+this.trigger.getWidth());
}
this.resizeEl = this.positionEl = this.wrap;
this.wrap.setWidth(this.el.getWidth()+this.trigger.getWidth());
}
this.resizeEl = this.positionEl = this.wrap;
- this.updateEditState();
+ },
+
+ getWidth: function() {
+ return(this.el.getWidth() + this.trigger.getWidth());
},
updateEditState: function(){
},
updateEditState: function(){
@@
-188,6
+189,7
@@
Ext.form.TriggerField = Ext.extend(Ext.form.TextField, {
afterRender : function(){
Ext.form.TriggerField.superclass.afterRender.call(this);
afterRender : function(){
Ext.form.TriggerField.superclass.afterRender.call(this);
+ this.updateEditState();
},
// private
},
// private