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.1.1 - Released 02/08/2010
[extjs.git]
/
src
/
widgets
/
Editor.js
diff --git
a/src/widgets/Editor.js
b/src/widgets/Editor.js
index
cc475eb
..
cdcf317
100644
(file)
--- a/
src/widgets/Editor.js
+++ b/
src/widgets/Editor.js
@@
-1,6
+1,6
@@
/*!
/*!
- * Ext JS Library 3.1.
0
- * Copyright(c) 2006-20
09
Ext JS, LLC
+ * Ext JS Library 3.1.
1
+ * Copyright(c) 2006-20
10
Ext JS, LLC
* licensing@extjs.com
* http://www.extjs.com/license
*/
* licensing@extjs.com
* http://www.extjs.com/license
*/
@@
-202,7
+202,7
@@
Ext.extend(Ext.Editor, Ext.Component, {
this.cancelEdit();
}
if(field.triggerBlur){
this.cancelEdit();
}
if(field.triggerBlur){
- field.triggerBlur();
+ field.triggerBlur();
}
}
this.fireEvent('specialkey', field, e);
}
}
this.fireEvent('specialkey', field, e);
@@
-336,7
+336,7
@@
Ext.extend(Ext.Editor, Ext.Component, {
this.fireEvent("canceledit", this, v, this.startValue);
}
},
this.fireEvent("canceledit", this, v, this.startValue);
}
},
-
+
// private
hideEdit: function(remainVisible){
if(remainVisible !== true){
// private
hideEdit: function(remainVisible){
if(remainVisible !== true){
@@
-347,7
+347,8
@@
Ext.extend(Ext.Editor, Ext.Component, {
// private
onBlur : function(){
// private
onBlur : function(){
- if(this.allowBlur !== true && this.editing){
+ // selectSameEditor flag allows the same editor to be started without onBlur firing on itself
+ if(this.allowBlur !== true && this.editing && this.selectSameEditor !== true){
this.completeEdit();
}
},
this.completeEdit();
}
},
@@
-386,7
+387,7
@@
Ext.extend(Ext.Editor, Ext.Component, {
beforeDestroy : function(){
Ext.destroyMembers(this, 'field');
beforeDestroy : function(){
Ext.destroyMembers(this, 'field');
-
+
delete this.parentEl;
delete this.boundEl;
}
delete this.parentEl;
delete this.boundEl;
}