X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/c930e9176a5a85509c5b0230e2bff5c22a591432..25ef3491bd9ae007ff1fc2b0d7943e6eaaccf775:/pkgs/pkg-grid-editor-debug.js diff --git a/pkgs/pkg-grid-editor-debug.js b/pkgs/pkg-grid-editor-debug.js index 6d7b49f1..11dde461 100644 --- a/pkgs/pkg-grid-editor-debug.js +++ b/pkgs/pkg-grid-editor-debug.js @@ -1,5 +1,5 @@ /*! - * Ext JS Library 3.0.0 + * Ext JS Library 3.0.3 * Copyright(c) 2006-2009 Ext JS, LLC * licensing@extjs.com * http://www.extjs.com/license @@ -60,15 +60,17 @@ Ext.extend(Ext.grid.CellSelectionModel, Ext.grid.AbstractSelectionModel, { /** @ignore */ initEvents : function(){ - this.grid.on("cellmousedown", this.handleMouseDown, this); - this.grid.getGridEl().on(Ext.EventManager.useKeydown ? "keydown" : "keypress", this.handleKeyDown, this); - var view = this.grid.view; - view.on("refresh", this.onViewChange, this); - view.on("rowupdated", this.onRowUpdated, this); - view.on("beforerowremoved", this.clearSelections, this); - view.on("beforerowsinserted", this.clearSelections, this); + this.grid.on('cellmousedown', this.handleMouseDown, this); + this.grid.on(Ext.EventManager.useKeydown ? 'keydown' : 'keypress', this.handleKeyDown, this); + this.grid.getView().on({ + scope: this, + refresh: this.onViewChange, + rowupdated: this.onRowUpdated, + beforerowremoved: this.clearSelections, + beforerowsinserted: this.clearSelections + }); if(this.grid.isEditor){ - this.grid.on("beforeedit", this.beforeEdit, this); + this.grid.on('beforeedit', this.beforeEdit, this); } }, @@ -179,85 +181,107 @@ var data = record.get(fieldName); isSelectable : function(rowIndex, colIndex, cm){ return !cm.isHidden(colIndex); }, + + // private + onEditorKey: function(field, e){ + if(e.getKey() == e.TAB){ + this.handleKeyDown(e); + } + }, /** @ignore */ handleKeyDown : function(e){ if(!e.isNavKeyPress()){ return; } - var g = this.grid, s = this.selection; + + var k = e.getKey(), + g = this.grid, + s = this.selection, + sm = this, + walk = function(row, col, step){ + return g.walkCells( + row, + col, + step, + g.isEditor && g.editing ? sm.acceptsNav : sm.isSelectable, // *** handle tabbing while editorgrid is in edit mode + sm + ); + }, + cell, newCell, r, c, ae; + + switch(k){ + case e.ESC: + case e.PAGE_UP: + case e.PAGE_DOWN: + // do nothing + break; + default: + // *** call e.stopEvent() only for non ESC, PAGE UP/DOWN KEYS + e.stopEvent(); + break; + } + if(!s){ - e.stopEvent(); - var cell = g.walkCells(0, 0, 1, this.isSelectable, this); + cell = walk(0, 0, 1); // *** use private walk() function defined above if(cell){ this.select(cell[0], cell[1]); } return; } - var sm = this; - var walk = function(row, col, step){ - return g.walkCells(row, col, step, sm.isSelectable, sm); - }; - var k = e.getKey(), r = s.cell[0], c = s.cell[1]; - var newCell; + cell = s.cell; // currently selected cell + r = cell[0]; // current row + c = cell[1]; // current column + switch(k){ - case e.TAB: - if(e.shiftKey){ - newCell = walk(r, c-1, -1); - }else{ - newCell = walk(r, c+1, 1); - } - break; - case e.DOWN: - newCell = walk(r+1, c, 1); - break; - case e.UP: - newCell = walk(r-1, c, -1); - break; - case e.RIGHT: - newCell = walk(r, c+1, 1); - break; - case e.LEFT: - newCell = walk(r, c-1, -1); - break; - case e.ENTER: - if(g.isEditor && !g.editing){ + case e.TAB: + if(e.shiftKey){ + newCell = walk(r, c - 1, -1); + }else{ + newCell = walk(r, c + 1, 1); + } + break; + case e.DOWN: + newCell = walk(r + 1, c, 1); + break; + case e.UP: + newCell = walk(r - 1, c, -1); + break; + case e.RIGHT: + newCell = walk(r, c + 1, 1); + break; + case e.LEFT: + newCell = walk(r, c - 1, -1); + break; + case e.ENTER: + if (g.isEditor && !g.editing) { g.startEditing(r, c); - e.stopEvent(); return; } - break; + break; } + if(newCell){ - this.select(newCell[0], newCell[1]); - e.stopEvent(); + // *** reassign r & c variables to newly-selected cell's row and column + r = newCell[0]; + c = newCell[1]; + + this.select(r, c); // *** highlight newly-selected cell and update selection + + if(g.isEditor && g.editing){ // *** handle tabbing while editorgrid is in edit mode + ae = g.activeEditor; + if(ae && ae.field.triggerBlur){ + // *** if activeEditor is a TriggerField, explicitly call its triggerBlur() method + ae.field.triggerBlur(); + } + g.startEditing(r, c); + } } }, acceptsNav : function(row, col, cm){ return !cm.isHidden(col) && cm.isCellEditable(col, row); - }, - - onEditorKey : function(field, e){ - var k = e.getKey(), newCell, g = this.grid, ed = g.activeEditor; - if(k == e.TAB){ - if(e.shiftKey){ - newCell = g.walkCells(ed.row, ed.col-1, -1, this.acceptsNav, this); - }else{ - newCell = g.walkCells(ed.row, ed.col+1, 1, this.acceptsNav, this); - } - e.stopEvent(); - }else if(k == e.ENTER){ - ed.completeEdit(); - e.stopEvent(); - }else if(k == e.ESC){ - e.stopEvent(); - ed.cancelEdit(); - } - if(newCell){ - g.startEditing(newCell[0], newCell[1]); - } } });/** * @class Ext.grid.EditorGridPanel @@ -406,16 +430,17 @@ 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); } }, @@ -450,7 +475,7 @@ grid.on('validateedit', function(e) { onEditComplete : function(ed, value, startValue){ this.editing = false; this.activeEditor = null; - ed.un("specialkey", this.selModel.onEditorKey, this.selModel); + var r = ed.record; var field = this.colModel.getDataIndex(ed.col); value = this.postEditValue(value, startValue, r, field); @@ -501,22 +526,35 @@ 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; + var v = this.preEditValue(r, field); + ed.startEdit(this.view.getCell(row, col).firstChild, Ext.isDefined(v) ? v : ''); } } }, @@ -524,12 +562,12 @@ 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; + return this.autoEncode && Ext.isString(value) ? Ext.util.Format.htmlEncode(value) : value; }, /** @@ -537,10 +575,15 @@ grid.on('validateedit', function(e) { * @param {Boolean} cancel (optional) True to cancel any changes */ stopEditing : function(cancel){ - if(this.activeEditor){ - this.activeEditor[cancel === true ? 'cancelEdit' : 'completeEdit'](); + if(this.editing){ + var ae = 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);// private