Example usage:
*
var grid = new Ext.grid.GridPanel({
- {@link #store}: new (@link Ext.data.Store}({
+ {@link #store}: new {@link Ext.data.Store}({
{@link Ext.data.Store#autoDestroy autoDestroy}: true,
{@link Ext.data.Store#reader reader}: reader,
{@link Ext.data.Store#data data}: xg.dummyData
}),
- {@link #columns}: [
- {id: 'company', header: 'Company', width: 200, sortable: true, dataIndex: 'company'},
- {header: 'Price', width: 120, sortable: true, renderer: Ext.util.Format.usMoney, dataIndex: 'price'},
- {header: 'Change', width: 120, sortable: true, dataIndex: 'change'},
- {header: '% Change', width: 120, sortable: true, dataIndex: 'pctChange'},
- // instead of specifying renderer: Ext.util.Format.dateRenderer('m/d/Y') use xtype
- {header: 'Last Updated', width: 135, sortable: true, dataIndex: 'lastChange', xtype: 'datecolumn', format: 'M d, Y'}
- ],
+ {@link #colModel}: new {@link Ext.grid.ColumnModel}({
+ {@link Ext.grid.ColumnModel#defaults defaults}: {
+ width: 120,
+ sortable: true
+ },
+ {@link Ext.grid.ColumnModel#columns columns}: [
+ {id: 'company', header: 'Company', width: 200, sortable: true, dataIndex: 'company'},
+ {header: 'Price', renderer: Ext.util.Format.usMoney, dataIndex: 'price'},
+ {header: 'Change', dataIndex: 'change'},
+ {header: '% Change', dataIndex: 'pctChange'},
+ // instead of specifying renderer: Ext.util.Format.dateRenderer('m/d/Y') use xtype
+ {
+ header: 'Last Updated', width: 135, dataIndex: 'lastChange',
+ xtype: 'datecolumn', format: 'M d, Y'
+ }
+ ],
+ }),
{@link #viewConfig}: {
{@link Ext.grid.GridView#forceFit forceFit}: true,
@@ -140,7 +149,9 @@ Ext.grid.GridPanel = Ext.extend(Ext.Panel, {
* @cfg {Boolean} enableColumnResize false to turn off column resizing for the whole grid. Defaults to true.
*/
/**
- * @cfg {Boolean} enableColumnHide Defaults to true to enable hiding of columns with the header context menu.
+ * @cfg {Boolean} enableColumnHide
+ * Defaults to true to enable {@link Ext.grid.Column#hidden hiding of columns}
+ * with the {@link #enableHdMenu header menu}.
*/
enableColumnHide : true,
/**
@@ -219,6 +230,14 @@ Ext.grid.GridPanel = Ext.extend(Ext.Panel, {
* before a call to {@link Ext.Component#render render()}.
*/
view : null,
+
+ /**
+ * @cfg {Array} bubbleEvents
+ * An array of events that, when fired, should be bubbled to any parent container.
+ * Defaults to [].
+ */
+ bubbleEvents: [],
+
/**
* @cfg {Object} viewConfig A config object that will be applied to the grid's UI view. Any of
* the config options available for {@link Ext.grid.GridView} can be specified here. This option
@@ -474,26 +493,24 @@ function(grid, rowIndex, columnIndex, e) {
onRender : function(ct, position){
Ext.grid.GridPanel.superclass.onRender.apply(this, arguments);
- var c = this.body;
+ var c = this.getGridEl();
this.el.addClass('x-grid-panel');
- var view = this.getView();
- view.init(this);
-
this.mon(c, {
+ scope: this,
mousedown: this.onMouseDown,
click: this.onClick,
dblclick: this.onDblClick,
- contextmenu: this.onContextMenu,
- keydown: this.onKeyDown,
- scope: this
+ contextmenu: this.onContextMenu
});
- this.relayEvents(c, ['mousedown','mouseup','mouseover','mouseout','keypress']);
+ this.relayEvents(c, ['mousedown','mouseup','mouseover','mouseout','keypress', 'keydown']);
+ var view = this.getView();
+ view.init(this);
+ view.render();
this.getSelectionModel().init(this);
- this.view.render();
},
// private
@@ -512,8 +529,8 @@ function(grid, rowIndex, columnIndex, e) {
},
applyState : function(state){
- var cm = this.colModel;
- var cs = state.columns;
+ var cm = this.colModel,
+ cs = state.columns;
if(cs){
for(var i = 0, len = cs.length; i < len; i++){
var s = cs[i];
@@ -531,9 +548,10 @@ function(grid, rowIndex, columnIndex, e) {
if(state.sort && this.store){
this.store[this.store.remoteSort ? 'setDefaultSort' : 'sort'](state.sort.field, state.sort.direction);
}
- delete state.columns;
- delete state.sort;
- Ext.grid.GridPanel.superclass.applyState.call(this, state);
+ var o = Ext.apply({}, state);
+ delete o.columns;
+ delete o.sort;
+ Ext.grid.GridPanel.superclass.applyState.call(this, o);
},
getState : function(){
@@ -559,11 +577,13 @@ function(grid, rowIndex, columnIndex, e) {
// private
afterRender : function(){
Ext.grid.GridPanel.superclass.afterRender.call(this);
- this.view.layout();
+ var v = this.view;
+ this.on('bodyresize', v.layout, v);
+ v.layout();
if(this.deferRowRender){
- this.view.afterRender.defer(10, this.view);
+ v.afterRender.defer(10, this.view);
}else{
- this.view.afterRender();
+ v.afterRender();
}
this.viewReady = true;
},
@@ -595,11 +615,6 @@ function(grid, rowIndex, columnIndex, e) {
this.fireEvent('reconfigure', this, store, colModel);
},
- // private
- onKeyDown : function(e){
- this.fireEvent('keydown', e);
- },
-
// private
onDestroy : function(){
if(this.rendered){
@@ -971,7 +986,7 @@ Ext.grid.GridView = function(config){
* @param {Number} rowIndex The index of the row to be removed.
* @param {Ext.data.Record} record The Record to be removed
*/
- "beforerowremoved",
+ 'beforerowremoved',
/**
* @event beforerowsinserted
* Internal UI Event. Fired before rows are inserted.
@@ -979,13 +994,13 @@ Ext.grid.GridView = function(config){
* @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",
+ 'beforerowsinserted',
/**
* @event beforerefresh
* Internal UI Event. Fired before the view is refreshed.
* @param {Ext.grid.GridView} view
*/
- "beforerefresh",
+ 'beforerefresh',
/**
* @event rowremoved
* Internal UI Event. Fired after a row is removed.
@@ -993,7 +1008,7 @@ Ext.grid.GridView = function(config){
* @param {Number} rowIndex The index of the row that was removed.
* @param {Ext.data.Record} record The Record that was removed
*/
- "rowremoved",
+ 'rowremoved',
/**
* @event rowsinserted
* Internal UI Event. Fired after rows are inserted.
@@ -1001,7 +1016,7 @@ Ext.grid.GridView = function(config){
* @param {Number} firstRow The index of the first inserted.
* @param {Number} lastRow The index of the last row inserted.
*/
- "rowsinserted",
+ 'rowsinserted',
/**
* @event rowupdated
* Internal UI Event. Fired after a row has been updated.
@@ -1009,13 +1024,13 @@ Ext.grid.GridView = function(config){
* @param {Number} firstRow The index of the row updated.
* @param {Ext.data.record} record The Record backing the row updated.
*/
- "rowupdated",
+ 'rowupdated',
/**
* @event refresh
* Internal UI Event. Fired after the GridView's body has been refreshed.
* @param {Ext.grid.GridView} view
*/
- "refresh"
+ 'refresh'
);
Ext.grid.GridView.superclass.constructor.call(this);
};
@@ -1098,9 +1113,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
@@ -1121,24 +1137,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;}
@@ -1152,7 +1168,7 @@ viewConfig: {
* @type String
*/
- selectedRowClass : "x-grid3-row-selected",
+ selectedRowClass : 'x-grid3-row-selected',
// private
borderWidth : 2,
@@ -1247,7 +1263,7 @@ viewConfig: {
}
this.templates = ts;
- this.colRe = new RegExp("x-grid3-td-([^\\s]+)", "");
+ this.colRe = new RegExp('x-grid3-td-([^\\s]+)', '');
},
// private
@@ -1294,7 +1310,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]);
@@ -1315,12 +1331,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))){
@@ -1351,11 +1367,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;
@@ -1363,12 +1379,12 @@ 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;
@@ -1376,30 +1392,30 @@ viewConfig: {
// 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];
},
@@ -1464,7 +1480,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
@@ -1478,7 +1494,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
@@ -1577,11 +1593,11 @@ 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.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 = " ";
+ p.value = ' ';
}
if(this.markDirty && r.dirty && typeof r.modified[c.name] !== 'undefined'){
p.css += ' x-grid3-dirty-cell';
@@ -1590,20 +1606,20 @@ viewConfig: {
}
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
@@ -1616,11 +1632,13 @@ viewConfig: {
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';
+ if(!skipStripe){
+ row.className = row.className.replace(this.rowClsRe, ' ');
+ if ((idx + 1) % 2 === 0){
+ row.className += ' x-grid3-row-alt';
+ }
}
- });
+ }, this);
// add first/last-row classes
if(startRow === 0){
Ext.fly(rows[0]).addClass(this.firstRowCls);
@@ -1661,7 +1679,7 @@ viewConfig: {
this.initElements();
// get mousedowns early
- Ext.fly(this.innerHd).on("click", this.handleHdDown, this);
+ Ext.fly(this.innerHd).on('click', this.handleHdDown, this);
this.mainHd.on({
scope: this,
mouseover: this.handleHdOver,
@@ -1680,27 +1698,27 @@ viewConfig: {
}
if(g.enableHdMenu !== false){
- this.hmenu = new Ext.menu.Menu({id: g.id + "-hctx"});
+ this.hmenu = new Ext.menu.Menu({id: g.id + '-hctx'});
this.hmenu.add(
- {itemId:"asc", text: this.sortAscText, cls: "xg-hmenu-sort-asc"},
- {itemId:"desc", text: this.sortDescText, cls: "xg-hmenu-sort-desc"}
+ {itemId:'asc', text: this.sortAscText, cls: 'xg-hmenu-sort-asc'},
+ {itemId:'desc', text: this.sortDescText, cls: 'xg-hmenu-sort-desc'}
);
if(g.enableColumnHide !== false){
- this.colMenu = new Ext.menu.Menu({id:g.id + "-hcols-menu"});
+ this.colMenu = new Ext.menu.Menu({id:g.id + '-hcols-menu'});
this.colMenu.on({
scope: this,
beforeshow: this.beforeColMenuShow,
itemclick: this.handleHdMenuClick
});
this.hmenu.add('-', {
- itemId:"columns",
+ itemId:'columns',
hideOnClick: false,
text: this.columnsText,
menu: this.colMenu,
iconCls: 'x-cols-icon'
});
}
- this.hmenu.on("itemclick", this.handleHdMenuClick, this);
+ this.hmenu.on('itemclick', this.handleHdMenuClick, this);
}
if(g.trackMouseOver){
@@ -1806,7 +1824,11 @@ viewConfig: {
// private
getOffsetWidth : function() {
- return (this.cm.getTotalWidth() + this.scrollOffset) + 'px';
+ return (this.cm.getTotalWidth() + this.getScrollOffset()) + 'px';
+ },
+
+ getScrollOffset: function(){
+ return Ext.num(this.scrollOffset, Ext.getScrollBarWidth());
},
// private
@@ -1821,7 +1843,7 @@ viewConfig: {
for(var i = 0; i < len; i++){
p.id = cm.getColumnId(i);
- p.value = cm.getColumnHeader(i) || "";
+ p.value = cm.getColumnHeader(i) || '';
p.style = this.getColumnStyle(i, true);
p.tooltip = this.getColumnTooltip(i);
p.css = i === 0 ? 'x-grid3-cell-first ' : (i == last ? 'x-grid3-cell-last ' : '');
@@ -1832,7 +1854,7 @@ viewConfig: {
}
cb[cb.length] = ct.apply(p);
}
- return ts.header.apply({cells: cb.join(""), tstyle:'width:'+this.getTotalWidth()+';'});
+ return ts.header.apply({cells: cb.join(''), tstyle:'width:'+this.getTotalWidth()+';'});
},
// private
@@ -1845,7 +1867,7 @@ viewConfig: {
return 'title="'+tt+'"';
}
}
- return "";
+ return '';
},
// private
@@ -1942,13 +1964,13 @@ viewConfig: {
ctop += p.offsetTop;
p = p.offsetParent;
}
+
ctop -= this.mainHd.dom.offsetHeight;
-
+ stop = parseInt(c.scrollTop, 10);
+
var cbot = ctop + rowEl.offsetHeight,
ch = c.clientHeight,
sbot = stop + ch;
-
- stop = parseInt(c.scrollTop, 10);
if(ctop < stop){
@@ -1979,7 +2001,7 @@ viewConfig: {
this.refresh();
}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);
@@ -1996,7 +2018,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.
@@ -2011,12 +2033,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);
}
},
@@ -2038,7 +2060,7 @@ viewConfig: {
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';
+ return (Ext.isBorderBox || (Ext.isWebKit && !Ext.isSafari2) ? w : (w - this.borderWidth > 0 ? w - this.borderWidth : 0)) + 'px';
}
return w;
},
@@ -2052,7 +2074,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;
@@ -2109,7 +2131,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);
@@ -2147,7 +2169,7 @@ viewConfig: {
var colCount = cm.getColumnCount();
if(ds.getCount() < 1){
- return "";
+ return '';
}
var cs = this.getColumnData();
@@ -2185,7 +2207,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);
},
/**
@@ -2193,7 +2215,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();
@@ -2205,7 +2227,7 @@ viewConfig: {
this.processRows(0, true);
this.layout();
this.applyEmptyText();
- this.fireEvent("refresh", this);
+ this.fireEvent('refresh', this);
},
// private
@@ -2244,41 +2266,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.splitone){ // enableColumnResize
+ this.splitone.destroy();
+ delete this.splitone._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
@@ -2311,12 +2367,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();
}
@@ -2335,11 +2391,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;
@@ -2381,19 +2437,19 @@ 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();
+ this.scrollToTop.defer(Ext.isGecko ? 1 : 0, this);
},
// private
@@ -2431,7 +2487,7 @@ viewConfig: {
/* -------------------- UI Events and Handlers ------------------------------ */
// private
initUI : function(grid){
- grid.on("headerclick", this.onHeaderClick, this);
+ grid.on('headerclick', this.onHeaderClick, this);
},
// private
@@ -2451,7 +2507,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');
}
},
@@ -2459,7 +2515,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');
}
},
@@ -2482,7 +2538,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');
}
},
@@ -2490,7 +2546,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');
}
},
@@ -2508,22 +2564,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();
@@ -2547,7 +2605,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,
@@ -2566,12 +2624,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?');
}
},
@@ -2579,12 +2637,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';
@@ -2595,18 +2653,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;
}
},
@@ -2614,8 +2675,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 = '';
}
},
@@ -2641,7 +2702,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;
@@ -2890,7 +2951,6 @@ Ext.extend(Ext.grid.HeaderDropZone, Ext.dd.DropZone, {
newIndex--;
}
cm.moveColumn(oldIndex, newIndex);
- this.grid.fireEvent("columnmove", oldIndex, newIndex);
return true;
}
return false;
@@ -3086,7 +3146,7 @@ Ext.extend(Ext.grid.GridDragZone, Ext.dd.DragZone, {
* {@link Ext.grid.Column} column configuration object within the specified Array defines the initial
* order of the column display. A Column's display may be initially hidden using the
* {@link Ext.grid.Column#hidden hidden} config property (and then shown using the column
- * header menu). Field's that are not included in the ColumnModel will not be displayable at all.
+ * header menu). Fields that are not included in the ColumnModel will not be displayable at all.
* How each column in the grid correlates (maps) to the {@link Ext.data.Record} field in the
* {@link Ext.data.Store Store} the column draws its data from is configured through the
* {@link Ext.grid.Column#dataIndex dataIndex}. If the
@@ -3265,12 +3325,16 @@ Ext.extend(Ext.grid.ColumnModel, Ext.util.Observable, {
this.config = config;
this.lookup = {};
- // if no id, create one
+
for(i = 0, len = config.length; i < len; i++){
c = Ext.applyIf(config[i], this.defaults);
+ // if no id, create one using column's ordinal position
+ if(typeof c.id == 'undefined'){
+ c.id = i;
+ }
if(!c.isColumn){
- var cls = Ext.grid.Column.types[c.xtype || 'gridcolumn'];
- c = new cls(c);
+ var Cls = Ext.grid.Column.types[c.xtype || 'gridcolumn'];
+ c = new Cls(c);
config[i] = c;
}
this.lookup[c.id] = c;
@@ -3364,7 +3428,7 @@ var columns = grid.getColumnModel().getColumnsBy(function(c){
* @return {Boolean}
*/
isSortable : function(col){
- return this.config[col].sortable;
+ return !!this.config[col].sortable;
},
/**
@@ -3571,22 +3635,24 @@ var grid = new Ext.grid.GridPanel({
this.config[col].editable = editable;
},
-
/**
- * Returns true if the column is hidden.
+ * Returns true if the column is {@link Ext.grid.Column#hidden hidden},
+ * false otherwise.
* @param {Number} colIndex The column index
* @return {Boolean}
*/
isHidden : function(colIndex){
- return this.config[colIndex].hidden;
+ return !!this.config[colIndex].hidden; // ensure returns boolean
},
-
/**
- * Returns true if the column width cannot be changed
+ * Returns true if the column is {@link Ext.grid.Column#fixed fixed},
+ * false otherwise.
+ * @param {Number} colIndex The column index
+ * @return {Boolean}
*/
isFixed : function(colIndex){
- return this.config[colIndex].fixed;
+ return !!this.config[colIndex].fixed;
},
/**
@@ -3715,7 +3781,7 @@ Ext.grid.RowSelectionModel = function(config){
* Fires when the selection changes
* @param {SelectionModel} this
*/
- "selectionchange",
+ 'selectionchange',
/**
* @event beforerowselect
* Fires before a row is selected, return false to cancel the selection.
@@ -3724,7 +3790,7 @@ Ext.grid.RowSelectionModel = function(config){
* @param {Boolean} keepExisting False if other selections will be cleared
* @param {Record} record The record to be selected
*/
- "beforerowselect",
+ 'beforerowselect',
/**
* @event rowselect
* Fires when a row is selected.
@@ -3732,7 +3798,7 @@ Ext.grid.RowSelectionModel = function(config){
* @param {Number} rowIndex The selected index
* @param {Ext.data.Record} r The selected record
*/
- "rowselect",
+ 'rowselect',
/**
* @event rowdeselect
* Fires when a row is deselected. To prevent deselection
@@ -3741,7 +3807,7 @@ Ext.grid.RowSelectionModel = function(config){
* @param {Number} rowIndex
* @param {Record} record
*/
- "rowdeselect"
+ 'rowdeselect'
);
Ext.grid.RowSelectionModel.superclass.constructor.call(this);
@@ -3764,18 +3830,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){
@@ -3789,7 +3848,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){
@@ -3806,10 +3865,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
@@ -3824,7 +3885,7 @@ Ext.extend(Ext.grid.RowSelectionModel, Ext.grid.AbstractSelectionModel, {
}
}
if(s.length != this.selections.getCount()){
- this.fireEvent("selectionchange", this);
+ this.fireEvent('selectionchange', this);
}
},
@@ -4011,7 +4072,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);
},
@@ -4120,7 +4181,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();
}
@@ -4129,8 +4190,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);
}
},
@@ -4159,8 +4220,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);
}
},
@@ -4178,7 +4239,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();
@@ -4189,24 +4255,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;
@@ -4223,7 +4299,7 @@ Ext.extend(Ext.grid.RowSelectionModel, Ext.grid.AbstractSelectionModel, {
Ext.grid.Column = function(config){
Ext.apply(this, config);
- if(typeof this.renderer == 'string'){
+ if(Ext.isString(this.renderer)){
this.renderer = Ext.util.Format[this.renderer];
} else if(Ext.isObject(this.renderer)){
this.scope = this.renderer.scope;
@@ -4231,16 +4307,11 @@ Ext.grid.Column = function(config){
}
this.renderer = this.renderer.createDelegate(this.scope || config);
- if(this.id === undefined){
- this.id = ++Ext.grid.Column.AUTO_ID;
- }
if(this.editor){
this.editor = Ext.create(this.editor, 'textfield');
}
};
-Ext.grid.Column.AUTO_ID = 0;
-
Ext.grid.Column.prototype = {
/**
* @cfg {Boolean} editable Optional. Defaults to true, enabling the configured
@@ -4325,8 +4396,8 @@ Ext.grid.Column.prototype = {
*/
/**
* @cfg {Boolean} sortable Optional. true if sorting is to be allowed on this column.
- * Defaults to the value of the {@link #defaultSortable} property.
- * Whether local/remote sorting is used is specified in {@link Ext.data.Store#remoteSort}.
+ * Defaults to the value of the {@link Ext.grid.ColumnModel#defaultSortable} property.
+ * Whether local/remote sorting is used is specified in {@link Ext.data.Store#remoteSort}.
*/
/**
* @cfg {Boolean} fixed Optional. true if the column width cannot be changed. Defaults to false.
@@ -4338,7 +4409,10 @@ Ext.grid.Column.prototype = {
* @cfg {Boolean} menuDisabled Optional. true to disable the column menu. Defaults to false.
*/
/**
- * @cfg {Boolean} hidden Optional. true to hide the column. Defaults to false.
+ * @cfg {Boolean} hidden
+ * Optional. true to initially hide this column. Defaults to false.
+ * A hidden column {@link Ext.grid.GridPanel#enableColumnHide may be shown via the header row menu}.
+ * If a column is never to be shown, simply do not include this column in the Column Model at all.
*/
/**
* @cfg {String} tooltip Optional. A text string to use as the column header's tooltip. If Quicktips
@@ -4435,8 +4509,15 @@ var grid = new Ext.grid.GridPanel({
* if editing is supported by the grid. See {@link #editable} also.
*/
- // private. Used by ColumnModel to avoid reprocessing
+ /**
+ * @private
+ * @cfg {Boolean} isColumn
+ * Used by ColumnModel setConfig method to avoid reprocessing a Column
+ * if isColumn is not set ColumnModel will recreate a new Ext.grid.Column
+ * Defaults to true.
+ */
isColumn : true,
+
/**
* Optional. A function which returns displayable data when passed the following parameters:
*
@@ -4456,7 +4537,7 @@ var grid = new Ext.grid.GridPanel({
* @type Function
*/
renderer : function(value){
- if(typeof value == 'string' && value.length < 1){
+ if(Ext.isString(value) && value.length < 1){
return ' ';
}
return value;
@@ -4492,8 +4573,8 @@ var grid = new Ext.grid.GridPanel({
/**
* @class Ext.grid.BooleanColumn
* @extends Ext.grid.Column
- * A Column definition class which renders boolean data fields. See the {@link Ext.grid.ColumnModel#xtype xtype}
- * config option of {@link Ext.grid.ColumnModel} for more details.
+ * A Column definition class which renders boolean data fields. See the {@link Ext.grid.Column#xtype xtype}
+ * config option of {@link Ext.grid.Column} for more details.
*/
Ext.grid.BooleanColumn = Ext.extend(Ext.grid.Column, {
/**
@@ -4532,7 +4613,7 @@ Ext.grid.BooleanColumn = Ext.extend(Ext.grid.Column, {
* @class Ext.grid.NumberColumn
* @extends Ext.grid.Column
* A Column definition class which renders a numeric data field according to a {@link #format} string. See the
- * {@link Ext.grid.ColumnModel#xtype xtype} config option of {@link Ext.grid.ColumnModel} for more details.
+ * {@link Ext.grid.Column#xtype xtype} config option of {@link Ext.grid.Column} for more details.
*/
Ext.grid.NumberColumn = Ext.extend(Ext.grid.Column, {
/**
@@ -4551,7 +4632,7 @@ Ext.grid.NumberColumn = Ext.extend(Ext.grid.Column, {
* @class Ext.grid.DateColumn
* @extends Ext.grid.Column
* A Column definition class which renders a passed date according to the default locale, or a configured
- * {@link #format}. See the {@link Ext.grid.ColumnModel#xtype xtype} config option of {@link Ext.grid.ColumnModel}
+ * {@link #format}. See the {@link Ext.grid.Column#xtype xtype} config option of {@link Ext.grid.Column}
* for more details.
*/
Ext.grid.DateColumn = Ext.extend(Ext.grid.Column, {
@@ -4572,7 +4653,7 @@ Ext.grid.DateColumn = Ext.extend(Ext.grid.Column, {
* @extends Ext.grid.Column
* A Column definition class which renders a value by processing a {@link Ext.data.Record Record}'s
* {@link Ext.data.Record#data data} using a {@link #tpl configured} {@link Ext.XTemplate XTemplate}.
- * See the {@link Ext.grid.ColumnModel#xtype xtype} config option of {@link Ext.grid.ColumnModel} for more
+ * See the {@link Ext.grid.Column#xtype xtype} config option of {@link Ext.grid.Column} for more
* details.
*/
Ext.grid.TemplateColumn = Ext.extend(Ext.grid.Column, {
@@ -4583,7 +4664,7 @@ Ext.grid.TemplateColumn = Ext.extend(Ext.grid.Column, {
*/
constructor: function(cfg){
Ext.grid.TemplateColumn.superclass.constructor.call(this, cfg);
- var tpl = typeof Ext.isObject(this.tpl) ? this.tpl : new Ext.XTemplate(this.tpl);
+ var tpl = Ext.isObject(this.tpl) ? this.tpl : new Ext.XTemplate(this.tpl);
this.renderer = function(value, p, r){
return tpl.apply(r.data);
};
@@ -4690,24 +4771,24 @@ Ext.grid.CheckboxSelectionModel = Ext.extend(Ext.grid.RowSelectionModel, {
* 'Select Rows'), but the automatic check all/none behavior will only work if the
* 'x-grid3-hd-checker' class is supplied.
*/
- header: ' ',
+ header : ' ',
/**
* @cfg {Number} width The default width in pixels of the checkbox column (defaults to 20).
*/
- width: 20,
+ width : 20,
/**
* @cfg {Boolean} sortable true if the checkbox column is sortable (defaults to
* false).
*/
- sortable: false,
+ sortable : false,
// private
- menuDisabled:true,
- fixed:true,
- dataIndex: '',
- id: 'checker',
+ menuDisabled : true,
+ fixed : true,
+ dataIndex : '',
+ id : 'checker',
- constructor: function(){
+ constructor : function(){
Ext.grid.CheckboxSelectionModel.superclass.constructor.apply(this, arguments);
if(this.checkOnly){