X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/c930e9176a5a85509c5b0230e2bff5c22a591432..b37ceabb82336ee82757cd32efe353cfab8ec267:/src/widgets/grid/EditorGrid.js
diff --git a/src/widgets/grid/EditorGrid.js b/src/widgets/grid/EditorGrid.js
index 740f2251..7c27d8be 100644
--- a/src/widgets/grid/EditorGrid.js
+++ b/src/widgets/grid/EditorGrid.js
@@ -1,6 +1,6 @@
/*!
- * Ext JS Library 3.0.0
- * Copyright(c) 2006-2009 Ext JS, LLC
+ * Ext JS Library 3.2.2
+ * Copyright(c) 2006-2010 Ext JS, Inc.
* licensing@extjs.com
* http://www.extjs.com/license
*/
@@ -35,7 +35,7 @@ Ext.grid.EditorGridPanel = Ext.extend(Ext.grid.GridPanel, {
* editing that cell.
*/
clicksToEdit: 2,
-
+
/**
* @cfg {Boolean} forceValidation
* True to force validation even if the value is unmodified (defaults to false)
@@ -47,15 +47,15 @@ Ext.grid.EditorGridPanel = Ext.extend(Ext.grid.GridPanel, {
// private
detectEdit: false,
- /**
- * @cfg {Boolean} autoEncode
- * True to automatically HTML encode and decode values pre and post edit (defaults to false)
- */
- autoEncode : false,
+ /**
+ * @cfg {Boolean} autoEncode
+ * True to automatically HTML encode and decode values pre and post edit (defaults to false)
+ */
+ autoEncode : false,
- /**
- * @cfg {Boolean} trackMouseOver @hide
- */
+ /**
+ * @cfg {Boolean} trackMouseOver @hide
+ */
// private
trackMouseOver: false, // causes very odd FF errors
@@ -73,7 +73,7 @@ Ext.grid.EditorGridPanel = Ext.extend(Ext.grid.GridPanel, {
this.activeEditor = null;
- this.addEvents(
+ this.addEvents(
/**
* @event beforeedit
* Fires before cell editing is triggered. The edit event object has the following properties
@@ -102,13 +102,13 @@ Ext.grid.EditorGridPanel = Ext.extend(Ext.grid.GridPanel, {
* column - The grid column index
*
*
- *
+ *
grid.on('afteredit', afterEdit, this );
function afterEdit(e) {
// execute an XHR to send/commit data to the server, in callback do (if successful):
e.record.commit();
-};
+};
*
* @param {Object} e An edit event (see above for description)
*/
@@ -131,10 +131,10 @@ function afterEdit(e) {
* records (not all). By observing the grid's validateedit event, it can be cancelled if
* the edit occurs on a targeted row (for example) and then setting the field's new value
* in the Record directly:
- *
+ *
grid.on('validateedit', function(e) {
var myTargetRow = 6;
-
+
if (e.row == myTargetRow) {
e.cancel = true;
e.record.data[e.field] = e.value;
@@ -151,16 +151,25 @@ grid.on('validateedit', function(e) {
initEvents : function(){
Ext.grid.EditorGridPanel.superclass.initEvents.call(this);
- this.on("bodyscroll", this.stopEditing, this, [true]);
- this.on("columnresize", this.stopEditing, this, [true]);
+ this.getGridEl().on('mousewheel', this.stopEditing.createDelegate(this, [true]), this);
+ this.on('columnresize', this.stopEditing, this, [true]);
if(this.clicksToEdit == 1){
this.on("cellclick", this.onCellDblClick, this);
}else {
- if(this.clicksToEdit == 'auto' && this.view.mainBody){
- this.view.mainBody.on("mousedown", this.onAutoEditClick, this);
+ var view = this.getView();
+ if(this.clicksToEdit == 'auto' && view.mainBody){
+ view.mainBody.on('mousedown', this.onAutoEditClick, this);
}
- this.on("celldblclick", this.onCellDblClick, this);
+ this.on('celldblclick', this.onCellDblClick, this);
+ }
+ },
+
+ onResize : function(){
+ Ext.grid.EditorGridPanel.superclass.onResize.apply(this, arguments);
+ var ae = this.activeEditor;
+ if(this.editing && ae){
+ ae.realign(true);
}
},
@@ -174,8 +183,8 @@ grid.on('validateedit', function(e) {
if(e.button !== 0){
return;
}
- var row = this.view.findRowIndex(t);
- var col = this.view.findCellIndex(t);
+ var row = this.view.findRowIndex(t),
+ col = this.view.findCellIndex(t);
if(row !== false && col !== false){
this.stopEditing();
if(this.selModel.getSelectedCell){ // cell sm
@@ -194,10 +203,11 @@ grid.on('validateedit', function(e) {
// private
onEditComplete : function(ed, value, startValue){
this.editing = false;
+ this.lastActiveEditor = this.activeEditor;
this.activeEditor = null;
- ed.un("specialkey", this.selModel.onEditorKey, this.selModel);
- var r = ed.record;
- var field = this.colModel.getDataIndex(ed.col);
+
+ var r = ed.record,
+ field = this.colModel.getDataIndex(ed.col);
value = this.postEditValue(value, startValue, r, field);
if(this.forceValidation === true || String(value) !== String(startValue)){
var e = {
@@ -228,17 +238,17 @@ grid.on('validateedit', function(e) {
this.stopEditing();
if(this.colModel.isCellEditable(col, row)){
this.view.ensureVisible(row, col, true);
- var r = this.store.getAt(row);
- var field = this.colModel.getDataIndex(col);
- var e = {
- grid: this,
- record: r,
- field: field,
- value: r.data[field],
- row: row,
- column: col,
- cancel:false
- };
+ var r = this.store.getAt(row),
+ field = this.colModel.getDataIndex(col),
+ e = {
+ grid: this,
+ record: r,
+ field: field,
+ value: r.data[field],
+ row: row,
+ column: col,
+ cancel:false
+ };
if(this.fireEvent("beforeedit", e) !== false && !e.cancel){
this.editing = true;
var ed = this.colModel.getCellEditor(col, row);
@@ -246,22 +256,43 @@ grid.on('validateedit', function(e) {
return;
}
if(!ed.rendered){
- ed.render(this.view.getEditorParent(ed));
+ ed.parentEl = this.view.getEditorParent(ed);
+ ed.on({
+ scope: this,
+ render: {
+ fn: function(c){
+ c.field.focus(false, true);
+ },
+ single: true,
+ scope: this
+ },
+ specialkey: function(field, e){
+ this.getSelectionModel().onEditorKey(field, e);
+ },
+ complete: this.onEditComplete,
+ canceledit: this.stopEditing.createDelegate(this, [true])
+ });
}
- (function(){ // complex but required for focus issues in safari, ie and opera
- ed.row = row;
- ed.col = col;
- ed.record = r;
- ed.on("complete", this.onEditComplete, this, {single: true});
- ed.on("specialkey", this.selModel.onEditorKey, this.selModel);
- /**
- * The currently active editor or null
- * @type Ext.Editor
- */
- this.activeEditor = ed;
- var v = this.preEditValue(r, field);
- ed.startEdit(this.view.getCell(row, col).firstChild, v === undefined ? '' : v);
- }).defer(50, this);
+ Ext.apply(ed, {
+ row : row,
+ col : col,
+ record : r
+ });
+ this.lastEdit = {
+ row: row,
+ col: col
+ };
+ this.activeEditor = ed;
+ // Set the selectSameEditor flag if we are reusing the same editor again and
+ // need to prevent the editor from firing onBlur on itself.
+ ed.selectSameEditor = (this.activeEditor == this.lastActiveEditor);
+ var v = this.preEditValue(r, field);
+ ed.startEdit(this.view.getCell(row, col).firstChild, Ext.isDefined(v) ? v : '');
+
+ // Clear the selectSameEditor flag
+ (function(){
+ delete ed.selectSameEditor;
+ }).defer(50);
}
}
},
@@ -269,23 +300,29 @@ grid.on('validateedit', function(e) {
// private
preEditValue : function(r, field){
var value = r.data[field];
- return this.autoEncode && typeof value == 'string' ? Ext.util.Format.htmlDecode(value) : value;
+ return this.autoEncode && Ext.isString(value) ? Ext.util.Format.htmlDecode(value) : value;
},
// private
- postEditValue : function(value, originalValue, r, field){
- return this.autoEncode && typeof value == 'string' ? Ext.util.Format.htmlEncode(value) : value;
- },
+ postEditValue : function(value, originalValue, r, field){
+ return this.autoEncode && Ext.isString(value) ? Ext.util.Format.htmlEncode(value) : value;
+ },
/**
* Stops any active editing
* @param {Boolean} cancel (optional) True to cancel any changes
*/
stopEditing : function(cancel){
- if(this.activeEditor){
- this.activeEditor[cancel === true ? 'cancelEdit' : 'completeEdit']();
+ if(this.editing){
+ // Store the lastActiveEditor to check if it is changing
+ var ae = this.lastActiveEditor = this.activeEditor;
+ if(ae){
+ ae[cancel === true ? 'cancelEdit' : 'completeEdit']();
+ this.view.focusCell(ae.row, ae.col);
+ }
+ this.activeEditor = null;
}
- this.activeEditor = null;
+ this.editing = false;
}
});
Ext.reg('editorgrid', Ext.grid.EditorGridPanel);
\ No newline at end of file