X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/c930e9176a5a85509c5b0230e2bff5c22a591432..530ef4b6c5b943cfa68b779d11cf7de29aa878bf:/src/widgets/grid/GridView.js
diff --git a/src/widgets/grid/GridView.js b/src/widgets/grid/GridView.js
index a290de34..bff0819c 100644
--- a/src/widgets/grid/GridView.js
+++ b/src/widgets/grid/GridView.js
@@ -1,6 +1,6 @@
/*!
- * Ext JS Library 3.0.0
- * Copyright(c) 2006-2009 Ext JS, LLC
+ * Ext JS Library 3.2.1
+ * Copyright(c) 2006-2010 Ext JS, Inc.
* 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
@@ -94,7 +34,7 @@ viewConfig: {
}
return 'x-grid3-row-collapsed';
}
-},
+},
* @param {Record} record The {@link Ext.data.Record} corresponding to the current row.
* @param {Number} index The row index.
@@ -115,10 +55,12 @@ viewConfig: {
* @method getRowClass
* @return {String} a CSS class name to add to the row.
*/
+
/**
* @cfg {Boolean} enableRowBody True to add a second TR element per row that can be used to provide a row body
* that spans beneath the data row. Use the {@link #getRowClass} method's rowParams config to customize the row body.
*/
+
/**
* @cfg {String} emptyText Default text (html tags are accepted) to display in the grid body when no rows
* are available (defaults to ''). This value will be used to update the {@link #mainBody}:
@@ -126,8 +68,9 @@ viewConfig: {
this.mainBody.update('<div class="x-grid-empty">' + this.emptyText + '</div>');
*/
+
/**
- * @cfg {Boolean} headersDisabled True to disable the grid column headers (defaults to false).
+ * @cfg {Boolean} headersDisabled True to disable the grid column headers (defaults to false).
* Use the {@link Ext.grid.ColumnModel ColumnModel} {@link Ext.grid.ColumnModel#menuDisabled menuDisabled}
* config to disable the menu for individual columns. While this config is true the
* following will be disabled:
@@ -135,6 +78,7 @@ viewConfig: {
* - the trigger to reveal the menu.
*
A customized implementation of a {@link Ext.dd.DragZone DragZone} which provides default implementations
* of the template methods of DragZone to enable dragging of the selected rows of a GridPanel.
@@ -146,26 +90,31 @@ viewConfig: {
* @property dragZone
* @type {Ext.grid.GridDragZone}
*/
+
/**
* @cfg {Boolean} deferEmptyText True to defer {@link #emptyText} being applied until the store's
* first load (defaults to true).
*/
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
- * when the grid is initially rendered. The
+ * when the grid is initially rendered. The
* {@link Ext.grid.Column#width initially configured width} of each column will be adjusted
* to fit the grid width and prevent horizontal scrolling. If columns are later resized (manually
* or programmatically), the other columns in the grid will not be resized to fit the grid width.
* See {@link #forceFit} also.
*/
autoFill : false,
+
/**
* @cfg {Boolean} forceFit
* Defaults to false. Specify true to have the column widths re-proportioned
@@ -175,25 +124,29 @@ viewConfig: {
* to fit the grid width. See {@link #autoFill} also.
*/
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 +160,7 @@ viewConfig: {
* @type String
*/
- selectedRowClass : "x-grid3-row-selected",
+ selectedRowClass : 'x-grid3-row-selected',
// private
borderWidth : 2,
@@ -224,6 +177,11 @@ viewConfig: {
*/
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')
*/
@@ -232,12 +190,77 @@ viewConfig: {
* @cfg {String} rowSelector The selector used to find rows internally (defaults to 'div.x-grid3-row')
*/
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 ----------------------------- */
// private
@@ -245,31 +268,31 @@ viewConfig: {
var ts = this.templates || {};
if(!ts.master){
ts.master = new Ext.Template(
- '',
- '
',
- '
',
- '
',
- '
',
+ '
',
+ '
',
+ '
',
+ '
', this.grid.enableHdMenu ? ' ' : '',
- '{value}  ',
- ' | '
- );
+ '', this.grid.enableHdMenu ? ' ' : '',
+ '{value} ',
+ ' | '
+ );
}
if(!ts.body){
@@ -278,11 +301,11 @@ viewConfig: {
if(!ts.row){
ts.row = new Ext.Template(
- '',
- '{cells}
',
- (this.enableRowBody ? '{body} |
' : ''),
- '
',
+ '{cells}
',
+ (this.enableRowBody ? '{body} |
' : ''),
+ '
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 +429,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,45 +441,57 @@ 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];
+ return this.mainHd.dom.getElementsByTagName('td')[index];
},
// manipulating elements
@@ -482,7 +517,7 @@ viewConfig: {
Ext.removeNode(this.getRow(row));
this.syncFocusEl(row);
},
-
+
// private
removeRows : function(firstRow, lastRow){
var bd = this.mainBody.dom;
@@ -517,9 +552,9 @@ viewConfig: {
// private
syncScroll : function(){
- this.syncHeaderScroll();
- var mb = this.scroller.dom;
- this.grid.fireEvent("bodyscroll", mb.scrollLeft, mb.scrollTop);
+ this.syncHeaderScroll();
+ var mb = this.scroller.dom;
+ this.grid.fireEvent('bodyscroll', mb.scrollLeft, mb.scrollTop);
},
// private
@@ -533,22 +568,25 @@ 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
updateAllColumnWidths : function(){
- var tw = this.getTotalWidth(),
+ var tw = this.getTotalWidth(),
clen = this.cm.getColumnCount(),
- ws = [],
+ ws = [],
len,
i;
+
for(i = 0; i < clen; i++){
ws[i] = this.getColumnWidth(i);
}
+
this.innerHd.firstChild.style.width = this.getOffsetWidth();
this.innerHd.firstChild.firstChild.style.width = tw;
this.mainBody.dom.style.width = tw;
+
for(i = 0; i < clen; i++){
var hd = this.getHeaderCell(i);
hd.style.width = ws[i];
@@ -619,67 +657,120 @@ viewConfig: {
this.layout();
},
- // private
- doRender : function(cs, rs, ds, startRow, colCount, stripe){
- var ts = this.templates, ct = ts.cell, rt = ts.row, last = colCount-1;
- var tstyle = 'width:'+this.getTotalWidth()+';';
+ /**
+ * @private
+ * Renders all of the rows to a string buffer and returns the string. This is called internally
+ * by renderRows and performs the actual string building for the rows - it does not inject HTML into the DOM.
+ * @param {Array} columns The column data acquired from getColumnData.
+ * @param {Array} records The array of records to render
+ * @param {Ext.data.Store} store The store to render the rows from
+ * @param {Number} startRow The index of the first row being rendered. Sometimes we only render a subset of
+ * the rows so this is used to maintain logic for striping etc
+ * @param {Number} colCount The total number of columns in the column model
+ * @param {Boolean} stripe True to stripe the rows
+ * @return {String} A string containing the HTML for the rendered rows
+ */
+ doRender : function(columns, records, store, startRow, colCount, stripe) {
+ var templates = this.templates,
+ cellTemplate = templates.cell,
+ rowTemplate = templates.row,
+ last = colCount - 1;
+
+ var tstyle = 'width:' + this.getTotalWidth() + ';';
+
// buffers
- var buf = [], cb, c, p = {}, rp = {tstyle: tstyle}, r;
- for(var j = 0, len = rs.length; j < len; j++){
- r = rs[j]; cb = [];
- var rowIndex = (j+startRow);
- for(var i = 0; i < colCount; i++){
- 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.style = c.style;
- if(Ext.isEmpty(p.value)){
- p.value = " ";
+ var rowBuffer = [],
+ colBuffer = [],
+ rowParams = {tstyle: tstyle},
+ meta = {},
+ column,
+ record;
+
+ //build up each row's HTML
+ for (var j = 0, len = records.length; j < len; j++) {
+ record = records[j];
+ colBuffer = [];
+
+ var rowIndex = j + startRow;
+
+ //build up each column's HTML
+ for (var i = 0; i < colCount; i++) {
+ column = columns[i];
+
+ meta.id = column.id;
+ meta.css = i === 0 ? 'x-grid3-cell-first ' : (i == last ? 'x-grid3-cell-last ' : '');
+ meta.attr = meta.cellAttr = '';
+ meta.style = column.style;
+ meta.value = column.renderer.call(column.scope, record.data[column.name], meta, record, rowIndex, i, store);
+
+ if (Ext.isEmpty(meta.value)) {
+ meta.value = ' ';
}
- if(this.markDirty && r.dirty && typeof r.modified[c.name] !== 'undefined'){
- p.css += ' x-grid3-dirty-cell';
+
+ if (this.markDirty && record.dirty && Ext.isDefined(record.modified[column.name])) {
+ meta.css += ' x-grid3-dirty-cell';
}
- cb[cb.length] = ct.apply(p);
+
+ colBuffer[colBuffer.length] = cellTemplate.apply(meta);
}
+
+ //set up row striping and row dirtiness CSS classes
var alt = [];
- if(stripe && ((rowIndex+1) % 2 === 0)){
- alt[0] = "x-grid3-row-alt";
+
+ if (stripe && ((rowIndex + 1) % 2 === 0)) {
+ alt[0] = 'x-grid3-row-alt';
}
- if(r.dirty){
- alt[1] = " x-grid3-dirty-row";
+
+ if (record.dirty) {
+ alt[1] = ' x-grid3-dirty-row';
}
- rp.cols = colCount;
- if(this.getRowClass){
- alt[2] = this.getRowClass(r, rowIndex, rp, ds);
+
+ rowParams.cols = colCount;
+
+ if (this.getRowClass) {
+ alt[2] = this.getRowClass(record, rowIndex, rowParams, store);
}
- rp.alt = alt.join(" ");
- rp.cells = cb.join("");
- buf[buf.length] = rt.apply(rp);
+
+ rowParams.alt = alt.join(' ');
+ rowParams.cells = colBuffer.join('');
+
+ rowBuffer[rowBuffer.length] = rowTemplate.apply(rowParams);
}
- return buf.join("");
+
+ return rowBuffer.join('');
},
// private
- processRows : function(startRow, skipStripe){
- if(!this.ds || this.ds.getCount() < 1){
+ processRows : function(startRow, skipStripe) {
+ 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';
+ startRow = startRow || 0;
+
+ for (i = 0; i= last){
- this.refresh();
- }else{
- if(!isUpdate){
- this.fireEvent("beforerowsinserted", this, firstRow, lastRow);
+ if( !isUpdate && firstRow === 0 && lastRow >= last) {
+ this.fireEvent('beforerowsinserted', this, firstRow, lastRow);
+ this.refresh();
+ this.fireEvent('rowsinserted', this, firstRow, lastRow);
+ } else {
+ if (!isUpdate) {
+ this.fireEvent('beforerowsinserted', this, firstRow, lastRow);
}
var html = this.renderRows(firstRow, lastRow),
before = this.getRow(firstRow);
- if(before){
+ if (before) {
if(firstRow === 0){
Ext.fly(this.getRow(0)).removeClass(this.firstRowCls);
}
Ext.DomHelper.insertHtml('beforeBegin', before, html);
- }else{
+ } else {
var r = this.getRow(last - 1);
if(r){
Ext.fly(r).removeClass(this.lastRowCls);
}
Ext.DomHelper.insertHtml('beforeEnd', this.mainBody.dom, html);
}
- if(!isUpdate){
- this.fireEvent("rowsinserted", this, firstRow, lastRow);
+ if (!isUpdate) {
+ this.fireEvent('rowsinserted', this, firstRow, lastRow);
this.processRows(firstRow);
- }else if(firstRow === 0 || firstRow >= last){
+ } else if (firstRow === 0 || firstRow >= last) {
//ensure first/last row is kept after an update.
Ext.fly(this.getRow(firstRow)).addClass(firstRow === 0 ? this.firstRowCls : this.lastRowCls);
}
@@ -1066,12 +1208,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 +1234,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 +1249,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 +1261,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 +1306,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);
@@ -1179,19 +1321,29 @@ viewConfig: {
}
},
- // private
+ /**
+ * @private
+ * Returns an array of column configurations - one for each column
+ * @return {Array} Array of column config objects. This includes the column name, renderer, id style and renderer
+ */
getColumnData : function(){
// build a map for all the columns
- var cs = [], cm = this.cm, colCount = cm.getColumnCount();
- for(var i = 0; i < colCount; i++){
+ var cs = [],
+ cm = this.cm,
+ colCount = cm.getColumnCount();
+
+ 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),
- renderer : cm.getRenderer(i),
- id : cm.getColumnId(i),
- style : this.getColumnStyle(i)
+ 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)
};
}
+
return cs;
},
@@ -1202,13 +1354,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 +1377,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 +1392,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 +1400,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,35 +1412,61 @@ viewConfig: {
this.processRows(0, true);
this.layout();
this.applyEmptyText();
- this.fireEvent("refresh", this);
+ this.fireEvent('refresh', this);
},
- // private
+ /**
+ * @private
+ * Displays the configured emptyText if there are currently no rows to display
+ */
applyEmptyText : function(){
if(this.emptyText && !this.hasRows()){
this.mainBody.update('' + this.emptyText + '
');
}
},
- // private
+ /**
+ * @private
+ * Adds sorting classes to the column headers based on the bound store's sortInfo. Fires the 'sortchange' event
+ * if the sorting has changed since this function was last run.
+ */
updateHeaderSortState : function(){
var state = this.ds.getSortState();
- if(!state){
+ if (!state) {
return;
}
- if(!this.sortState || (this.sortState.field != state.field || this.sortState.direction != state.direction)){
+
+ if (!this.sortState || (this.sortState.field != state.field || this.sortState.direction != state.direction)) {
this.grid.fireEvent('sortchange', this.grid, state);
}
+
this.sortState = state;
+
var sortColumn = this.cm.findColumnIndex(state.field);
- if(sortColumn != -1){
+ if (sortColumn != -1){
var sortDir = state.direction;
this.updateSortIcon(sortColumn, sortDir);
}
},
+ /**
+ * @private
+ * Removes any sorting indicator classes from the column headers
+ */
+ 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.scrollToTopTask && this.scrollToTopTask.cancel){
+ this.scrollToTopTask.cancel();
+ }
if(this.colMenu){
Ext.menu.MenuMgr.unregister(this.colMenu);
this.colMenu.destroy();
@@ -1299,41 +1477,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
@@ -1346,12 +1558,12 @@ viewConfig: {
if(this.autoFill){
var ct = this.grid.ownerCt;
if (ct && ct.getLayout()){
- ct.on('afterlayout', function(){
+ ct.on('afterlayout', function(){
this.fitColumns(true, true);
- this.updateHeaders();
- }, this, {single: true});
- }else{
- this.fitColumns(true, true);
+ this.updateHeaders();
+ }, this, {single: true});
+ }else{
+ this.fitColumns(true, true);
}
}else if(this.forceFit){
this.fitColumns(true, false);
@@ -1366,12 +1578,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 +1602,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;
@@ -1436,19 +1648,26 @@ viewConfig: {
// 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();
+ if (Ext.isGecko){
+ if (!this.scrollToTopTask) {
+ this.scrollToTopTask = new Ext.util.DelayedTask(this.scrollToTop, this);
+ }
+ this.scrollToTopTask.delay(1);
+ }else{
+ this.scrollToTop();
+ }
},
// private
@@ -1486,7 +1705,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 +1725,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 +1733,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 +1756,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 +1764,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 +1782,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();
@@ -1592,7 +1813,7 @@ viewConfig: {
// private
isHideableColumn : function(c){
- return !c.hidden && !c.fixed;
+ return !c.hidden;
},
// private
@@ -1600,9 +1821,9 @@ viewConfig: {
var cm = this.cm, colCount = cm.getColumnCount();
this.colMenu.removeAll();
for(var i = 0; i < colCount; i++){
- if(cm.config[i].fixed !== true && cm.config[i].hideable !== false){
+ if(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 +1842,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 +1855,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 +1871,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 +1893,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 = '';
}
},
@@ -1690,29 +1914,31 @@ viewConfig: {
// private
// This is a support class used internally by the Grid components
-Ext.grid.GridView.SplitDragZone = function(grid, hd){
- this.grid = grid;
- this.view = grid.getView();
- this.marker = this.view.resizeMarker;
- this.proxy = this.view.resizeProxy;
- Ext.grid.GridView.SplitDragZone.superclass.constructor.call(this, hd,
- "gridSplitters" + this.grid.getGridEl().id, {
- dragElId : Ext.id(this.proxy.dom), resizeFrame:false
- });
- this.scroll = false;
- this.hw = this.view.splitHandleWidth || 5;
-};
-Ext.extend(Ext.grid.GridView.SplitDragZone, Ext.dd.DDProxy, {
+Ext.grid.GridView.SplitDragZone = Ext.extend(Ext.dd.DDProxy, {
+
+ constructor: function(grid, hd){
+ this.grid = grid;
+ this.view = grid.getView();
+ this.marker = this.view.resizeMarker;
+ this.proxy = this.view.resizeProxy;
+ Ext.grid.GridView.SplitDragZone.superclass.constructor.call(this, hd,
+ 'gridSplitters' + this.grid.getGridEl().id, {
+ dragElId : Ext.id(this.proxy.dom), resizeFrame:false
+ });
+ this.scroll = false;
+ this.hw = this.view.splitHandleWidth || 5;
+ },
b4StartDrag : function(x, y){
+ this.dragHeadersDisabled = this.view.headersDisabled;
this.view.headersDisabled = true;
var h = this.view.mainWrap.getHeight();
this.marker.setHeight(h);
this.marker.show();
this.marker.alignTo(this.view.getHeaderCell(this.cellIndex), 'tl-tl', [-2, 0]);
this.proxy.setHeight(h);
- var w = this.cm.getColumnWidth(this.cellIndex);
- var minw = Math.max(w-this.grid.minColumnWidth, 0);
+ var w = this.cm.getColumnWidth(this.cellIndex),
+ minw = Math.max(w-this.grid.minColumnWidth, 0);
this.resetConstraints();
this.setXConstraint(minw, 1000);
this.setYConstraint(0, 0);
@@ -1722,13 +1948,19 @@ Ext.extend(Ext.grid.GridView.SplitDragZone, Ext.dd.DDProxy, {
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){
- 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;
+ if(t && this.allowHeaderDrag(e)){
+ var xy = this.view.fly(t).getXY(),
+ x = xy[0],
+ y = xy[1],
+ exy = e.getXY(), ex = exy[0],
+ w = t.offsetWidth, adjust = false;
+
if((ex - x) <= this.hw){
adjust = -1;
}else if((x+w) - ex <= this.hw){
@@ -1761,12 +1993,14 @@ Ext.extend(Ext.grid.GridView.SplitDragZone, Ext.dd.DDProxy, {
endDrag : function(e){
this.marker.hide();
- var v = this.view;
- var endX = Math.max(this.minX, e.getPageX());
- var diff = endX - this.startPos;
+ var v = this.view,
+ endX = Math.max(this.minX, e.getPageX()),
+ diff = endX - this.startPos,
+ disabled = this.dragHeadersDisabled;
+
v.onColumnSplitterMoved(this.cellIndex, this.cm.getColumnWidth(this.cellIndex)+diff);
setTimeout(function(){
- v.headersDisabled = false;
+ v.headersDisabled = disabled;
}, 50);
},