X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/c930e9176a5a85509c5b0230e2bff5c22a591432..10a866c12701c0a0afd0ac85dcdcf32a421514ac:/src/widgets/grid/GridView.js?ds=sidebyside diff --git a/src/widgets/grid/GridView.js b/src/widgets/grid/GridView.js index a290de34..407b7aa6 100644 --- a/src/widgets/grid/GridView.js +++ b/src/widgets/grid/GridView.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 @@ -15,67 +15,7 @@ * @constructor * @param {Object} config */ -Ext.grid.GridView = function(config){ - Ext.apply(this, config); - // These events are only used internally by the grid components - this.addEvents( - /** - * @event beforerowremoved - * Internal UI Event. Fired before a row is removed. - * @param {Ext.grid.GridView} view - * @param {Number} rowIndex The index of the row to be removed. - * @param {Ext.data.Record} record The Record to be removed - */ - "beforerowremoved", - /** - * @event beforerowsinserted - * Internal UI Event. Fired before rows are inserted. - * @param {Ext.grid.GridView} view - * @param {Number} firstRow The index of the first row to be inserted. - * @param {Number} lastRow The index of the last row to be inserted. - */ - "beforerowsinserted", - /** - * @event beforerefresh - * Internal UI Event. Fired before the view is refreshed. - * @param {Ext.grid.GridView} view - */ - "beforerefresh", - /** - * @event rowremoved - * Internal UI Event. Fired after a row is removed. - * @param {Ext.grid.GridView} view - * @param {Number} rowIndex The index of the row that was removed. - * @param {Ext.data.Record} record The Record that was removed - */ - "rowremoved", - /** - * @event rowsinserted - * Internal UI Event. Fired after rows are inserted. - * @param {Ext.grid.GridView} view - * @param {Number} firstRow The index of the first inserted. - * @param {Number} lastRow The index of the last row inserted. - */ - "rowsinserted", - /** - * @event rowupdated - * Internal UI Event. Fired after a row has been updated. - * @param {Ext.grid.GridView} view - * @param {Number} firstRow The index of the row updated. - * @param {Ext.data.record} record The Record backing the row updated. - */ - "rowupdated", - /** - * @event refresh - * Internal UI Event. Fired after the GridView's body has been refreshed. - * @param {Ext.grid.GridView} view - */ - "refresh" - ); - Ext.grid.GridView.superclass.constructor.call(this); -}; - -Ext.extend(Ext.grid.GridView, Ext.util.Observable, { +Ext.grid.GridView = Ext.extend(Ext.util.Observable, { /** * Override this function to apply custom CSS classes to rows during rendering. You can also supply custom * parameters to the row template for the current row to customize how it is rendered using the rowParams @@ -153,9 +93,10 @@ viewConfig: { deferEmptyText : true, /** * @cfg {Number} scrollOffset The amount of space to reserve for the vertical scrollbar - * (defaults to 19 pixels). + * (defaults to undefined). If an explicit value isn't specified, this will be automatically + * calculated. */ - scrollOffset : 19, + scrollOffset : undefined, /** * @cfg {Boolean} autoFill * Defaults to false. Specify true to have the column widths re-proportioned @@ -176,24 +117,24 @@ viewConfig: { */ forceFit : false, /** - * @cfg {Array} sortClasses The CSS classes applied to a header when it is sorted. (defaults to ["sort-asc", "sort-desc"]) + * @cfg {Array} sortClasses The CSS classes applied to a header when it is sorted. (defaults to ['sort-asc', 'sort-desc']) */ - sortClasses : ["sort-asc", "sort-desc"], + sortClasses : ['sort-asc', 'sort-desc'], /** - * @cfg {String} sortAscText The text displayed in the "Sort Ascending" menu item (defaults to "Sort Ascending") + * @cfg {String} sortAscText The text displayed in the 'Sort Ascending' menu item (defaults to 'Sort Ascending') */ - sortAscText : "Sort Ascending", + sortAscText : 'Sort Ascending', /** - * @cfg {String} sortDescText The text displayed in the "Sort Descending" menu item (defaults to "Sort Descending") + * @cfg {String} sortDescText The text displayed in the 'Sort Descending' menu item (defaults to 'Sort Descending') */ - sortDescText : "Sort Descending", + sortDescText : 'Sort Descending', /** - * @cfg {String} columnsText The text displayed in the "Columns" menu item (defaults to "Columns") + * @cfg {String} columnsText The text displayed in the 'Columns' menu item (defaults to 'Columns') */ - columnsText : "Columns", + columnsText : 'Columns', /** - * @cfg {String} selectedRowClass The CSS class applied to a selected row (defaults to "x-grid3-row-selected"). An + * @cfg {String} selectedRowClass The CSS class applied to a selected row (defaults to 'x-grid3-row-selected'). An * example overriding the default styling: 

     .x-grid3-row-selected {background-color: yellow;}
@@ -207,7 +148,7 @@ viewConfig: {
* @type String */ - selectedRowClass : "x-grid3-row-selected", + selectedRowClass : 'x-grid3-row-selected', // private borderWidth : 2, @@ -223,6 +164,11 @@ viewConfig: { * @cfg {Number} rowSelectorDepth The number of levels to search for rows in event delegation (defaults to 10) */ rowSelectorDepth : 10, + + /** + * @cfg {Number} rowBodySelectorDepth The number of levels to search for row bodies in event delegation (defaults to 10) + */ + rowBodySelectorDepth : 10, /** * @cfg {String} cellSelector The selector used to find cells internally (defaults to 'td.x-grid3-cell') @@ -233,10 +179,75 @@ viewConfig: { */ rowSelector : 'div.x-grid3-row', + /** + * @cfg {String} rowBodySelector The selector used to find row bodies internally (defaults to 'div.x-grid3-row') + */ + rowBodySelector : 'div.x-grid3-row-body', + // private firstRowCls: 'x-grid3-row-first', lastRowCls: 'x-grid3-row-last', rowClsRe: /(?:^|\s+)x-grid3-row-(first|last|alt)(?:\s+|$)/g, + + constructor : function(config){ + Ext.apply(this, config); + // These events are only used internally by the grid components + this.addEvents( + /** + * @event beforerowremoved + * Internal UI Event. Fired before a row is removed. + * @param {Ext.grid.GridView} view + * @param {Number} rowIndex The index of the row to be removed. + * @param {Ext.data.Record} record The Record to be removed + */ + 'beforerowremoved', + /** + * @event beforerowsinserted + * Internal UI Event. Fired before rows are inserted. + * @param {Ext.grid.GridView} view + * @param {Number} firstRow The index of the first row to be inserted. + * @param {Number} lastRow The index of the last row to be inserted. + */ + 'beforerowsinserted', + /** + * @event beforerefresh + * Internal UI Event. Fired before the view is refreshed. + * @param {Ext.grid.GridView} view + */ + 'beforerefresh', + /** + * @event rowremoved + * Internal UI Event. Fired after a row is removed. + * @param {Ext.grid.GridView} view + * @param {Number} rowIndex The index of the row that was removed. + * @param {Ext.data.Record} record The Record that was removed + */ + 'rowremoved', + /** + * @event rowsinserted + * Internal UI Event. Fired after rows are inserted. + * @param {Ext.grid.GridView} view + * @param {Number} firstRow The index of the first inserted. + * @param {Number} lastRow The index of the last row inserted. + */ + 'rowsinserted', + /** + * @event rowupdated + * Internal UI Event. Fired after a row has been updated. + * @param {Ext.grid.GridView} view + * @param {Number} firstRow The index of the row updated. + * @param {Ext.data.record} record The Record backing the row updated. + */ + 'rowupdated', + /** + * @event refresh + * Internal UI Event. Fired after the GridView's body has been refreshed. + * @param {Ext.grid.GridView} view + */ + 'refresh' + ); + Ext.grid.GridView.superclass.constructor.call(this); + }, /* -------------------------------- UI Specific ----------------------------- */ @@ -295,14 +306,14 @@ viewConfig: { for(var k in ts){ var t = ts[k]; - if(t && typeof t.compile == 'function' && !t.compiled){ + if(t && Ext.isFunction(t.compile) && !t.compiled){ t.disableFormats = true; t.compile(); } } this.templates = ts; - this.colRe = new RegExp("x-grid3-td-([^\\s]+)", ""); + this.colRe = new RegExp('x-grid3-td-([^\\s]+)', ''); }, // private @@ -349,7 +360,7 @@ viewConfig: { this.mainBody = new E(this.scroller.dom.firstChild); this.focusEl = new E(this.scroller.dom.childNodes[1]); - this.focusEl.swallowEvent("click", true); + this.focusEl.swallowEvent('click', true); this.resizeMarker = new E(cs[1]); this.resizeProxy = new E(cs[2]); @@ -370,12 +381,12 @@ viewConfig: { return this.fly(el).findParent(this.cellSelector, this.cellSelectorDepth); }, -/** - *

Return the index of the grid column which contains the passed element.

- * See also {@link #findRowIndex} - * @param {Element} el The target element - * @return The column index, or false if the target element is not within a row of this GridView. - */ + /** + *

Return the index of the grid column which contains the passed HTMLElement.

+ * See also {@link #findRowIndex} + * @param {HTMLElement} el The target element + * @return {Number} The column index, or false if the target element is not within a row of this GridView. + */ findCellIndex : function(el, requiredCls){ var cell = this.findCell(el); if(cell && (!requiredCls || this.fly(cell).hasClass(requiredCls))){ @@ -406,11 +417,11 @@ viewConfig: { return this.findCellIndex(el, this.hdCls); }, -/** - * Return the HtmlElement representing the grid row which contains the passed element. - * @param {Element} el The target element - * @return The row element, or null if the target element is not within a row of this GridView. - */ + /** + * Return the HtmlElement representing the grid row which contains the passed element. + * @param {HTMLElement} el The target HTMLElement + * @return {HTMLElement} The row element, or null if the target element is not within a row of this GridView. + */ findRow : function(el){ if(!el){ return false; @@ -418,43 +429,55 @@ viewConfig: { return this.fly(el).findParent(this.rowSelector, this.rowSelectorDepth); }, -/** - *

Return the index of the grid row which contains the passed element.

- * See also {@link #findCellIndex} - * @param {Element} el The target element - * @return The row index, or false if the target element is not within a row of this GridView. - */ + /** + *

Return the index of the grid row which contains the passed HTMLElement.

+ * See also {@link #findCellIndex} + * @param {HTMLElement} el The target HTMLElement + * @return {Number} The row index, or false if the target element is not within a row of this GridView. + */ findRowIndex : function(el){ var r = this.findRow(el); return r ? r.rowIndex : false; }, + + /** + * Return the HtmlElement representing the grid row body which contains the passed element. + * @param {HTMLElement} el The target HTMLElement + * @return {HTMLElement} The row body element, or null if the target element is not within a row body of this GridView. + */ + findRowBody : function(el){ + if(!el){ + return false; + } + return this.fly(el).findParent(this.rowBodySelector, this.rowBodySelectorDepth); + }, // getter methods for fetching elements dynamically in the grid -/** - * Return the <div> HtmlElement which represents a Grid row for the specified index. - * @param {Number} index The row index - * @return {HtmlElement} The div element. - */ + /** + * Return the <div> HtmlElement which represents a Grid row for the specified index. + * @param {Number} index The row index + * @return {HtmlElement} The div element. + */ getRow : function(row){ return this.getRows()[row]; }, -/** - * Returns the grid's <td> HtmlElement at the specified coordinates. - * @param {Number} row The row index in which to find the cell. - * @param {Number} col The column index of the cell. - * @return {HtmlElement} The td at the specified coordinates. - */ + /** + * Returns the grid's <td> HtmlElement at the specified coordinates. + * @param {Number} row The row index in which to find the cell. + * @param {Number} col The column index of the cell. + * @return {HtmlElement} The td at the specified coordinates. + */ getCell : function(row, col){ return this.getRow(row).getElementsByTagName('td')[col]; }, -/** - * Return the <td> HtmlElement which represents the Grid's header cell for the specified column index. - * @param {Number} index The column index - * @return {HtmlElement} The td element. - */ + /** + * Return the <td> HtmlElement which represents the Grid's header cell for the specified column index. + * @param {Number} index The column index + * @return {HtmlElement} The td element. + */ getHeaderCell : function(index){ return this.mainHd.dom.getElementsByTagName('td')[index]; }, @@ -519,7 +542,7 @@ viewConfig: { syncScroll : function(){ this.syncHeaderScroll(); var mb = this.scroller.dom; - this.grid.fireEvent("bodyscroll", mb.scrollLeft, mb.scrollTop); + this.grid.fireEvent('bodyscroll', mb.scrollLeft, mb.scrollTop); }, // private @@ -533,7 +556,7 @@ viewConfig: { updateSortIcon : function(col, dir){ var sc = this.sortClasses; var hds = this.mainHd.select('td').removeClass(sc); - hds.item(col).addClass(sc[dir == "DESC" ? 1 : 0]); + hds.item(col).addClass(sc[dir == 'DESC' ? 1 : 0]); }, // private @@ -632,33 +655,33 @@ viewConfig: { c = cs[i]; p.id = c.id; p.css = i === 0 ? 'x-grid3-cell-first ' : (i == last ? 'x-grid3-cell-last ' : ''); - p.attr = p.cellAttr = ""; - p.value = c.renderer(r.data[c.name], p, r, rowIndex, i, ds); + p.attr = p.cellAttr = ''; + p.value = c.renderer.call(c.scope, r.data[c.name], p, r, rowIndex, i, ds); p.style = c.style; if(Ext.isEmpty(p.value)){ - p.value = " "; + p.value = ' '; } - if(this.markDirty && r.dirty && typeof r.modified[c.name] !== 'undefined'){ + if(this.markDirty && r.dirty && Ext.isDefined(r.modified[c.name])){ p.css += ' x-grid3-dirty-cell'; } cb[cb.length] = ct.apply(p); } var alt = []; if(stripe && ((rowIndex+1) % 2 === 0)){ - alt[0] = "x-grid3-row-alt"; + alt[0] = 'x-grid3-row-alt'; } if(r.dirty){ - alt[1] = " x-grid3-dirty-row"; + alt[1] = ' x-grid3-dirty-row'; } rp.cols = colCount; if(this.getRowClass){ alt[2] = this.getRowClass(r, rowIndex, rp, ds); } - rp.alt = alt.join(" "); - rp.cells = cb.join(""); + rp.alt = alt.join(' '); + rp.cells = cb.join(''); buf[buf.length] = rt.apply(rp); } - return buf.join(""); + return buf.join(''); }, // private @@ -666,16 +689,24 @@ viewConfig: { if(!this.ds || this.ds.getCount() < 1){ return; } - var rows = this.getRows(); + var rows = this.getRows(), + len = rows.length, + i, r; + skipStripe = skipStripe || !this.grid.stripeRows; startRow = startRow || 0; - Ext.each(rows, function(row, idx){ - row.rowIndex = idx; - row.className = row.className.replace(this.rowClsRe, ' '); - if (!skipStripe && (idx + 1) % 2 === 0) { - row.className += ' x-grid3-row-alt'; - } - }); + for(i = 0; i= last){ + this.fireEvent('beforerowsinserted', this, firstRow, lastRow); this.refresh(); + this.fireEvent('rowsinserted', this, firstRow, lastRow); }else{ if(!isUpdate){ - this.fireEvent("beforerowsinserted", this, firstRow, lastRow); + this.fireEvent('beforerowsinserted', this, firstRow, lastRow); } var html = this.renderRows(firstRow, lastRow), before = this.getRow(firstRow); @@ -1051,7 +1092,7 @@ viewConfig: { Ext.DomHelper.insertHtml('beforeEnd', this.mainBody.dom, html); } if(!isUpdate){ - this.fireEvent("rowsinserted", this, firstRow, lastRow); + this.fireEvent('rowsinserted', this, firstRow, lastRow); this.processRows(firstRow); }else if(firstRow === 0 || firstRow >= last){ //ensure first/last row is kept after an update. @@ -1066,12 +1107,12 @@ viewConfig: { if(dm.getRowCount()<1){ this.refresh(); }else{ - this.fireEvent("beforerowsdeleted", this, firstRow, lastRow); + this.fireEvent('beforerowsdeleted', this, firstRow, lastRow); this.removeRows(firstRow, lastRow); this.processRows(firstRow); - this.fireEvent("rowsdeleted", this, firstRow, lastRow); + this.fireEvent('rowsdeleted', this, firstRow, lastRow); } }, @@ -1092,8 +1133,8 @@ viewConfig: { // private getColumnWidth : function(col){ var w = this.cm.getColumnWidth(col); - if(typeof w == 'number'){ - return (Ext.isBorderBox ? w : (w-this.borderWidth > 0 ? w-this.borderWidth:0)) + 'px'; + if(Ext.isNumber(w)){ + return (Ext.isBorderBox || (Ext.isWebKit && !Ext.isSafari2) ? w : (w - this.borderWidth > 0 ? w - this.borderWidth : 0)) + 'px'; } return w; }, @@ -1107,7 +1148,7 @@ viewConfig: { fitColumns : function(preventRefresh, onlyExpand, omitColumn){ var cm = this.cm, i; var tw = cm.getTotalWidth(false); - var aw = this.grid.getGridEl().getWidth(true)-this.scrollOffset; + var aw = this.grid.getGridEl().getWidth(true)-this.getScrollOffset(); if(aw < 20){ // not initialized, so don't screw up the default widths return; @@ -1119,7 +1160,7 @@ viewConfig: { } var vc = cm.getColumnCount(true); - var ac = vc-(typeof omitColumn == 'number' ? 1 : 0); + var ac = vc-(Ext.isNumber(omitColumn) ? 1 : 0); if(ac === 0){ ac = 1; omitColumn = undefined; @@ -1164,7 +1205,7 @@ viewConfig: { var g = this.grid, cm = this.cm; if(!this.userResized && g.autoExpandColumn){ var tw = cm.getTotalWidth(false); - var aw = this.grid.getGridEl().getWidth(true)-this.scrollOffset; + var aw = this.grid.getGridEl().getWidth(true)-this.getScrollOffset(); if(tw != aw){ var ci = cm.getIndexById(g.autoExpandColumn); var currentWidth = cm.getColumnWidth(ci); @@ -1186,8 +1227,9 @@ viewConfig: { for(var i = 0; i < colCount; i++){ var name = cm.getDataIndex(i); cs[i] = { - name : (typeof name == 'undefined' ? this.ds.fields.get(i).name : name), + name : (!Ext.isDefined(name) ? this.ds.fields.get(i).name : name), renderer : cm.getRenderer(i), + scope: cm.getRendererScope(i), id : cm.getColumnId(i), style : this.getColumnStyle(i) }; @@ -1202,13 +1244,13 @@ viewConfig: { var colCount = cm.getColumnCount(); if(ds.getCount() < 1){ - return ""; + return ''; } var cs = this.getColumnData(); startRow = startRow || 0; - endRow = typeof endRow == "undefined"? ds.getCount()-1 : endRow; + endRow = !Ext.isDefined(endRow) ? ds.getCount()-1 : endRow; // records to render var rs = ds.getRange(startRow, endRow); @@ -1225,7 +1267,7 @@ viewConfig: { // private refreshRow : function(record){ var ds = this.ds, index; - if(typeof record == 'number'){ + if(Ext.isNumber(record)){ index = record; record = ds.getAt(index); if(!record){ @@ -1240,7 +1282,7 @@ viewConfig: { this.insertRows(ds, index, index, true); this.getRow(index).rowIndex = index; this.onRemove(ds, record, index+1, true); - this.fireEvent("rowupdated", this, index, record); + this.fireEvent('rowupdated', this, index, record); }, /** @@ -1248,7 +1290,7 @@ viewConfig: { * @param {Boolean} headersToo (optional) True to also refresh the headers */ refresh : function(headersToo){ - this.fireEvent("beforerefresh", this); + this.fireEvent('beforerefresh', this); this.grid.stopEditing(true); var result = this.renderBody(); @@ -1260,7 +1302,7 @@ viewConfig: { this.processRows(0, true); this.layout(); this.applyEmptyText(); - this.fireEvent("refresh", this); + this.fireEvent('refresh', this); }, // private @@ -1287,6 +1329,16 @@ viewConfig: { } }, + // private + clearHeaderSortState : function(){ + if(!this.sortState){ + return; + } + this.grid.fireEvent('sortchange', this.grid, null); + this.mainHd.select('td').removeClass(this.sortClasses); + delete this.sortState; + }, + // private destroy : function(){ if(this.colMenu){ @@ -1299,41 +1351,75 @@ viewConfig: { this.hmenu.destroy(); delete this.hmenu; } + + this.initData(null, null); + this.purgeListeners(); + Ext.fly(this.innerHd).un("click", this.handleHdDown, this); + if(this.grid.enableColumnMove){ - var dds = Ext.dd.DDM.ids['gridHeader' + this.grid.getGridEl().id]; - if(dds){ - for(var dd in dds){ - if(!dds[dd].config.isTarget && dds[dd].dragElId){ - var elid = dds[dd].dragElId; - dds[dd].unreg(); - Ext.get(elid).remove(); - } else if(dds[dd].config.isTarget){ - dds[dd].proxyTop.remove(); - dds[dd].proxyBottom.remove(); - dds[dd].unreg(); - } - if(Ext.dd.DDM.locationCache[dd]){ - delete Ext.dd.DDM.locationCache[dd]; - } - } - delete Ext.dd.DDM.ids['gridHeader' + this.grid.getGridEl().id]; + Ext.destroy( + this.columnDrag.el, + this.columnDrag.proxy.ghost, + this.columnDrag.proxy.el, + this.columnDrop.el, + this.columnDrop.proxyTop, + this.columnDrop.proxyBottom, + this.columnDrag.dragData.ddel, + this.columnDrag.dragData.header + ); + if (this.columnDrag.proxy.anim) { + Ext.destroy(this.columnDrag.proxy.anim); } + delete this.columnDrag.proxy.ghost; + delete this.columnDrag.dragData.ddel; + delete this.columnDrag.dragData.header; + this.columnDrag.destroy(); + delete Ext.dd.DDM.locationCache[this.columnDrag.id]; + delete this.columnDrag._domRef; + + delete this.columnDrop.proxyTop; + delete this.columnDrop.proxyBottom; + this.columnDrop.destroy(); + delete Ext.dd.DDM.locationCache["gridHeader" + this.grid.getGridEl().id]; + delete this.columnDrop._domRef; + delete Ext.dd.DDM.ids[this.columnDrop.ddGroup]; } - if(this.dragZone){ - this.dragZone.unreg(); + if (this.splitZone){ // enableColumnResize + this.splitZone.destroy(); + delete this.splitZone._domRef; + delete Ext.dd.DDM.ids["gridSplitters" + this.grid.getGridEl().id]; } - + Ext.fly(this.innerHd).removeAllListeners(); Ext.removeNode(this.innerHd); - - Ext.destroy(this.resizeMarker, this.resizeProxy, this.focusEl, this.mainBody, - this.scroller, this.mainHd, this.mainWrap, this.dragZone, - this.splitZone, this.columnDrag, this.columnDrop); + delete this.innerHd; + + Ext.destroy( + this.el, + this.mainWrap, + this.mainHd, + this.scroller, + this.mainBody, + this.focusEl, + this.resizeMarker, + this.resizeProxy, + this.activeHdBtn, + this.dragZone, + this.splitZone, + this._flyweight + ); + + delete this.grid.container; + + if(this.dragZone){ + this.dragZone.destroy(); + } + + Ext.dd.DDM.currentTarget = null; + delete Ext.dd.DDM.locationCache[this.grid.getGridEl().id]; - this.initData(null, null); Ext.EventManager.removeResizeListener(this.onWindowResize, this); - this.purgeListeners(); }, // private @@ -1366,12 +1452,12 @@ viewConfig: { // private initData : function(ds, cm){ if(this.ds){ - this.ds.un("load", this.onLoad, this); - this.ds.un("datachanged", this.onDataChange, this); - this.ds.un("add", this.onAdd, this); - this.ds.un("remove", this.onRemove, this); - this.ds.un("update", this.onUpdate, this); - this.ds.un("clear", this.onClear, this); + this.ds.un('load', this.onLoad, this); + this.ds.un('datachanged', this.onDataChange, this); + this.ds.un('add', this.onAdd, this); + this.ds.un('remove', this.onRemove, this); + this.ds.un('update', this.onUpdate, this); + this.ds.un('clear', this.onClear, this); if(this.ds !== ds && this.ds.autoDestroy){ this.ds.destroy(); } @@ -1390,11 +1476,11 @@ viewConfig: { this.ds = ds; if(this.cm){ - this.cm.un("configchange", this.onColConfigChange, this); - this.cm.un("widthchange", this.onColWidthChange, this); - this.cm.un("headerchange", this.onHeaderChange, this); - this.cm.un("hiddenchange", this.onHiddenChange, this); - this.cm.un("columnmoved", this.onColumnMove, this); + this.cm.un('configchange', this.onColConfigChange, this); + this.cm.un('widthchange', this.onColWidthChange, this); + this.cm.un('headerchange', this.onHeaderChange, this); + this.cm.un('hiddenchange', this.onHiddenChange, this); + this.cm.un('columnmoved', this.onColumnMove, this); } if(cm){ delete this.lastViewWidth; @@ -1430,25 +1516,26 @@ viewConfig: { // private onAdd : function(ds, records, index){ + this.insertRows(ds, index, index + (records.length-1)); }, // private onRemove : function(ds, record, index, isUpdate){ if(isUpdate !== true){ - this.fireEvent("beforerowremoved", this, index, record); + this.fireEvent('beforerowremoved', this, index, record); } this.removeRow(index); if(isUpdate !== true){ this.processRows(index); this.applyEmptyText(); - this.fireEvent("rowremoved", this, index, record); + this.fireEvent('rowremoved', this, index, record); } }, // private onLoad : function(){ - this.scrollToTop(); + this.scrollToTop.defer(Ext.isGecko ? 1 : 0, this); }, // private @@ -1486,7 +1573,7 @@ viewConfig: { /* -------------------- UI Events and Handlers ------------------------------ */ // private initUI : function(grid){ - grid.on("headerclick", this.onHeaderClick, this); + grid.on('headerclick', this.onHeaderClick, this); }, // private @@ -1506,7 +1593,7 @@ viewConfig: { onRowOver : function(e, t){ var row; if((row = this.findRowIndex(t)) !== false){ - this.addRowClass(row, "x-grid3-row-over"); + this.addRowClass(row, 'x-grid3-row-over'); } }, @@ -1514,7 +1601,7 @@ viewConfig: { onRowOut : function(e, t){ var row; if((row = this.findRowIndex(t)) !== false && !e.within(this.getRow(row), true)){ - this.removeRowClass(row, "x-grid3-row-over"); + this.removeRowClass(row, 'x-grid3-row-over'); } }, @@ -1537,7 +1624,7 @@ viewConfig: { onCellSelect : function(row, col){ var cell = this.getCell(row, col); if(cell){ - this.fly(cell).addClass("x-grid3-cell-selected"); + this.fly(cell).addClass('x-grid3-cell-selected'); } }, @@ -1545,7 +1632,7 @@ viewConfig: { onCellDeselect : function(row, col){ var cell = this.getCell(row, col); if(cell){ - this.fly(cell).removeClass("x-grid3-cell-selected"); + this.fly(cell).removeClass('x-grid3-cell-selected'); } }, @@ -1563,22 +1650,24 @@ viewConfig: { this.syncHeaderScroll(); } - this.grid.fireEvent("columnresize", i, w); + this.grid.fireEvent('columnresize', i, w); }, // private handleHdMenuClick : function(item){ - var index = this.hdCtxIndex; - var cm = this.cm, ds = this.ds; - switch(item.itemId){ - case "asc": - ds.sort(cm.getDataIndex(index), "ASC"); + var index = this.hdCtxIndex, + cm = this.cm, + ds = this.ds, + id = item.getItemId(); + switch(id){ + case 'asc': + ds.sort(cm.getDataIndex(index), 'ASC'); break; - case "desc": - ds.sort(cm.getDataIndex(index), "DESC"); + case 'desc': + ds.sort(cm.getDataIndex(index), 'DESC'); break; default: - index = cm.getIndexById(item.itemId.substr(4)); + index = cm.getIndexById(id.substr(4)); if(index != -1){ if(item.checked && cm.getColumnsBy(this.isHideableColumn, this).length <= 1){ this.onDenyColumnHide(); @@ -1602,7 +1691,7 @@ viewConfig: { for(var i = 0; i < colCount; i++){ if(cm.config[i].fixed !== true && cm.config[i].hideable !== false){ this.colMenu.add(new Ext.menu.CheckItem({ - itemId: "col-"+cm.getColumnId(i), + itemId: 'col-'+cm.getColumnId(i), text: cm.getColumnHeader(i), checked: !cm.isHidden(i), hideOnClick:false, @@ -1621,12 +1710,12 @@ viewConfig: { var index = this.getCellIndex(hd); this.hdCtxIndex = index; var ms = this.hmenu.items, cm = this.cm; - ms.get("asc").setDisabled(!cm.isSortable(index)); - ms.get("desc").setDisabled(!cm.isSortable(index)); - this.hmenu.on("hide", function(){ + ms.get('asc').setDisabled(!cm.isSortable(index)); + ms.get('desc').setDisabled(!cm.isSortable(index)); + this.hmenu.on('hide', function(){ Ext.fly(hd).removeClass('x-grid3-hd-menu-open'); }, this, {single:true}); - this.hmenu.show(t, "tl-bl?"); + this.hmenu.show(t, 'tl-bl?'); } }, @@ -1634,12 +1723,12 @@ viewConfig: { handleHdOver : function(e, t){ var hd = this.findHeaderCell(t); if(hd && !this.headersDisabled){ - this.activeHd = hd; + this.activeHdRef = t; this.activeHdIndex = this.getCellIndex(hd); var fly = this.fly(hd); this.activeHdRegion = fly.getRegion(); if(!this.cm.isMenuDisabled(this.activeHdIndex)){ - fly.addClass("x-grid3-hd-over"); + fly.addClass('x-grid3-hd-over'); this.activeHdBtn = fly.child('.x-grid3-hd-btn'); if(this.activeHdBtn){ this.activeHdBtn.dom.style.height = (hd.firstChild.offsetHeight-1)+'px'; @@ -1650,18 +1739,21 @@ viewConfig: { // private handleHdMove : function(e, t){ - if(this.activeHd && !this.headersDisabled){ - var hw = this.splitHandleWidth || 5; - var r = this.activeHdRegion; - var x = e.getPageX(); - var ss = this.activeHd.style; - if(x - r.left <= hw && this.cm.isResizable(this.activeHdIndex-1)){ - ss.cursor = Ext.isAir ? 'move' : Ext.isWebKit ? 'e-resize' : 'col-resize'; // col-resize not always supported - }else if(r.right - x <= (!this.activeHdBtn ? hw : 2) && this.cm.isResizable(this.activeHdIndex)){ - ss.cursor = Ext.isAir ? 'move' : Ext.isWebKit ? 'w-resize' : 'col-resize'; - }else{ - ss.cursor = ''; + var hd = this.findHeaderCell(this.activeHdRef); + if(hd && !this.headersDisabled){ + var hw = this.splitHandleWidth || 5, + r = this.activeHdRegion, + x = e.getPageX(), + ss = hd.style, + cur = ''; + if(this.grid.enableColumnResize !== false){ + if(x - r.left <= hw && this.cm.isResizable(this.activeHdIndex-1)){ + cur = Ext.isAir ? 'move' : Ext.isWebKit ? 'e-resize' : 'col-resize'; // col-resize not always supported + }else if(r.right - x <= (!this.activeHdBtn ? hw : 2) && this.cm.isResizable(this.activeHdIndex)){ + cur = Ext.isAir ? 'move' : Ext.isWebKit ? 'w-resize' : 'col-resize'; + } } + ss.cursor = cur; } }, @@ -1669,8 +1761,8 @@ viewConfig: { handleHdOut : function(e, t){ var hd = this.findHeaderCell(t); if(hd && (!Ext.isIE || !e.within(hd, true))){ - this.activeHd = null; - this.fly(hd).removeClass("x-grid3-hd-over"); + this.activeHdRef = null; + this.fly(hd).removeClass('x-grid3-hd-over'); hd.style.cursor = ''; } }, @@ -1696,7 +1788,7 @@ Ext.grid.GridView.SplitDragZone = function(grid, hd){ this.marker = this.view.resizeMarker; this.proxy = this.view.resizeProxy; Ext.grid.GridView.SplitDragZone.superclass.constructor.call(this, hd, - "gridSplitters" + this.grid.getGridEl().id, { + 'gridSplitters' + this.grid.getGridEl().id, { dragElId : Ext.id(this.proxy.dom), resizeFrame:false }); this.scroll = false; @@ -1721,11 +1813,15 @@ Ext.extend(Ext.grid.GridView.SplitDragZone, Ext.dd.DDProxy, { this.startPos = x; Ext.dd.DDProxy.prototype.b4StartDrag.call(this, x, y); }, + + allowHeaderDrag : function(e){ + return true; + }, handleMouseDown : function(e){ var t = this.view.findHeaderCell(e.getTarget()); - if(t){ + if(t && this.allowHeaderDrag(e)){ var xy = this.view.fly(t).getXY(), x = xy[0], y = xy[1]; var exy = e.getXY(), ex = exy[0]; var w = t.offsetWidth, adjust = false;