X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/c930e9176a5a85509c5b0230e2bff5c22a591432..10a866c12701c0a0afd0ac85dcdcf32a421514ac:/src/widgets/grid/RowSelectionModel.js?ds=sidebyside diff --git a/src/widgets/grid/RowSelectionModel.js b/src/widgets/grid/RowSelectionModel.js index 95736f19..59fd9681 100644 --- a/src/widgets/grid/RowSelectionModel.js +++ b/src/widgets/grid/RowSelectionModel.js @@ -1,5 +1,5 @@ /*! - * Ext JS Library 3.0.0 + * Ext JS Library 3.1.0 * Copyright(c) 2006-2009 Ext JS, LLC * licensing@extjs.com * http://www.extjs.com/license @@ -14,60 +14,59 @@ * @constructor * @param {Object} config */ -Ext.grid.RowSelectionModel = function(config){ - Ext.apply(this, config); - this.selections = new Ext.util.MixedCollection(false, function(o){ - return o.id; - }); - - this.last = false; - this.lastActive = false; - - this.addEvents( - /** - * @event selectionchange - * Fires when the selection changes - * @param {SelectionModel} this - */ - "selectionchange", - /** - * @event beforerowselect - * Fires before a row is selected, return false to cancel the selection. - * @param {SelectionModel} this - * @param {Number} rowIndex The index to be selected - * @param {Boolean} keepExisting False if other selections will be cleared - * @param {Record} record The record to be selected - */ - "beforerowselect", - /** - * @event rowselect - * Fires when a row is selected. - * @param {SelectionModel} this - * @param {Number} rowIndex The selected index - * @param {Ext.data.Record} r The selected record - */ - "rowselect", - /** - * @event rowdeselect - * Fires when a row is deselected. To prevent deselection - * {@link Ext.grid.AbstractSelectionModel#lock lock the selections}. - * @param {SelectionModel} this - * @param {Number} rowIndex - * @param {Record} record - */ - "rowdeselect" - ); - - Ext.grid.RowSelectionModel.superclass.constructor.call(this); -}; - -Ext.extend(Ext.grid.RowSelectionModel, Ext.grid.AbstractSelectionModel, { +Ext.grid.RowSelectionModel = Ext.extend(Ext.grid.AbstractSelectionModel, { /** * @cfg {Boolean} singleSelect * true to allow selection of only one row at a time (defaults to false * allowing multiple selections) */ singleSelect : false, + + constructor : function(config){ + Ext.apply(this, config); + this.selections = new Ext.util.MixedCollection(false, function(o){ + return o.id; + }); + + this.last = false; + this.lastActive = false; + + this.addEvents( + /** + * @event selectionchange + * Fires when the selection changes + * @param {SelectionModel} this + */ + 'selectionchange', + /** + * @event beforerowselect + * Fires before a row is selected, return false to cancel the selection. + * @param {SelectionModel} this + * @param {Number} rowIndex The index to be selected + * @param {Boolean} keepExisting False if other selections will be cleared + * @param {Record} record The record to be selected + */ + 'beforerowselect', + /** + * @event rowselect + * Fires when a row is selected. + * @param {SelectionModel} this + * @param {Number} rowIndex The selected index + * @param {Ext.data.Record} r The selected record + */ + 'rowselect', + /** + * @event rowdeselect + * Fires when a row is deselected. To prevent deselection + * {@link Ext.grid.AbstractSelectionModel#lock lock the selections}. + * @param {SelectionModel} this + * @param {Number} rowIndex + * @param {Record} record + */ + 'rowdeselect' + ); + Ext.grid.RowSelectionModel.superclass.constructor.call(this); + }, /** * @cfg {Boolean} moveEditorOnEnter @@ -78,18 +77,11 @@ Ext.extend(Ext.grid.RowSelectionModel, Ext.grid.AbstractSelectionModel, { initEvents : function(){ if(!this.grid.enableDragDrop && !this.grid.enableDrag){ - this.grid.on("rowmousedown", this.handleMouseDown, this); - }else{ // allow click to work like normal - this.grid.on("rowclick", function(grid, rowIndex, e) { - if(e.button === 0 && !e.shiftKey && !e.ctrlKey) { - this.selectRow(rowIndex, false); - grid.view.focusRow(rowIndex); - } - }, this); + this.grid.on('rowmousedown', this.handleMouseDown, this); } this.rowNav = new Ext.KeyNav(this.grid.getGridEl(), { - "up" : function(e){ + 'up' : function(e){ if(!e.shiftKey || this.singleSelect){ this.selectPrevious(false); }else if(this.last !== false && this.lastActive !== false){ @@ -103,7 +95,7 @@ Ext.extend(Ext.grid.RowSelectionModel, Ext.grid.AbstractSelectionModel, { this.selectFirstRow(); } }, - "down" : function(e){ + 'down' : function(e){ if(!e.shiftKey || this.singleSelect){ this.selectNext(false); }else if(this.last !== false && this.lastActive !== false){ @@ -120,10 +112,12 @@ Ext.extend(Ext.grid.RowSelectionModel, Ext.grid.AbstractSelectionModel, { scope: this }); - var view = this.grid.view; - view.on("refresh", this.onRefresh, this); - view.on("rowupdated", this.onRowUpdated, this); - view.on("rowremoved", this.onRemove, this); + this.grid.getView().on({ + scope: this, + refresh: this.onRefresh, + rowupdated: this.onRowUpdated, + rowremoved: this.onRemove + }); }, // private @@ -138,7 +132,7 @@ Ext.extend(Ext.grid.RowSelectionModel, Ext.grid.AbstractSelectionModel, { } } if(s.length != this.selections.getCount()){ - this.fireEvent("selectionchange", this); + this.fireEvent('selectionchange', this); } }, @@ -259,8 +253,8 @@ Ext.extend(Ext.grid.RowSelectionModel, Ext.grid.AbstractSelectionModel, { * Calls the passed function with each selection. If the function returns * false, iteration is stopped and this function returns * false. Otherwise it returns true. - * @param {Function} fn - * @param {Object} scope (optional) + * @param {Function} fn The function to call upon each iteration. It is passed the selected {@link Ext.data.Record Record}. + * @param {Object} scope (optional) The scope (this reference) in which the function is executed. Defaults to this RowSelectionModel. * @return {Boolean} true if all selections were iterated */ each : function(fn, scope){ @@ -325,7 +319,7 @@ Ext.extend(Ext.grid.RowSelectionModel, Ext.grid.AbstractSelectionModel, { * @return {Boolean} */ isSelected : function(index){ - var r = typeof index == "number" ? this.grid.store.getAt(index) : index; + var r = Ext.isNumber(index) ? this.grid.store.getAt(index) : index; return (r && this.selections.key(r.id) ? true : false); }, @@ -434,7 +428,7 @@ Ext.extend(Ext.grid.RowSelectionModel, Ext.grid.AbstractSelectionModel, { return; } var r = this.grid.store.getAt(index); - if(r && this.fireEvent("beforerowselect", this, index, keepExisting, r) !== false){ + if(r && this.fireEvent('beforerowselect', this, index, keepExisting, r) !== false){ if(!keepExisting || this.singleSelect){ this.clearSelections(); } @@ -443,8 +437,8 @@ Ext.extend(Ext.grid.RowSelectionModel, Ext.grid.AbstractSelectionModel, { if(!preventViewNotify){ this.grid.getView().onRowSelect(index); } - this.fireEvent("rowselect", this, index, r); - this.fireEvent("selectionchange", this); + this.fireEvent('rowselect', this, index, r); + this.fireEvent('selectionchange', this); } }, @@ -473,8 +467,8 @@ Ext.extend(Ext.grid.RowSelectionModel, Ext.grid.AbstractSelectionModel, { if(!preventViewNotify){ this.grid.getView().onRowDeselect(index); } - this.fireEvent("rowdeselect", this, index, r); - this.fireEvent("selectionchange", this); + this.fireEvent('rowdeselect', this, index, r); + this.fireEvent('selectionchange', this); } }, @@ -492,7 +486,12 @@ Ext.extend(Ext.grid.RowSelectionModel, Ext.grid.AbstractSelectionModel, { // private onEditorKey : function(field, e){ - var k = e.getKey(), newCell, g = this.grid, ed = g.activeEditor; + var k = e.getKey(), + newCell, + g = this.grid, + last = g.lastEdit, + ed = g.activeEditor, + ae, last, r, c; var shift = e.shiftKey; if(k == e.TAB){ e.stopEvent(); @@ -503,24 +502,34 @@ Ext.extend(Ext.grid.RowSelectionModel, Ext.grid.AbstractSelectionModel, { newCell = g.walkCells(ed.row, ed.col+1, 1, this.acceptsNav, this); } }else if(k == e.ENTER){ - e.stopEvent(); - ed.completeEdit(); if(this.moveEditorOnEnter !== false){ if(shift){ - newCell = g.walkCells(ed.row - 1, ed.col, -1, this.acceptsNav, this); + newCell = g.walkCells(last.row - 1, last.col, -1, this.acceptsNav, this); }else{ - newCell = g.walkCells(ed.row + 1, ed.col, 1, this.acceptsNav, this); + newCell = g.walkCells(last.row + 1, last.col, 1, this.acceptsNav, this); } } - }else if(k == e.ESC){ - ed.cancelEdit(); } if(newCell){ - g.startEditing(newCell[0], newCell[1]); + r = newCell[0]; + c = newCell[1]; + + if(last.row != r){ + this.selectRow(r); // *** 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); } }, - destroy: function(){ + destroy : function(){ if(this.rowNav){ this.rowNav.disable(); this.rowNav = null;