',
'',
@@ -4910,36 +4902,40 @@ Ext.ux.grid.LockingGridView = Ext.extend(Ext.grid.GridView, {
},
initElements : function(){
- var E = Ext.Element,
- el = this.grid.getGridEl().dom.firstChild,
- cs = el.childNodes;
-
- this.el = new E(el);
- this.lockedWrap = new E(cs[0]);
- this.lockedHd = new E(this.lockedWrap.dom.firstChild);
- this.lockedInnerHd = this.lockedHd.dom.firstChild;
- this.lockedScroller = new E(this.lockedWrap.dom.childNodes[1]);
- this.lockedBody = new E(this.lockedScroller.dom.firstChild);
- this.mainWrap = new E(cs[1]);
- this.mainHd = new E(this.mainWrap.dom.firstChild);
-
+ var el = Ext.get(this.grid.getGridEl().dom.firstChild),
+ lockedWrap = el.child('div.x-grid3-locked'),
+ lockedHd = lockedWrap.child('div.x-grid3-header'),
+ lockedScroller = lockedWrap.child('div.x-grid3-scroller'),
+ mainWrap = el.child('div.x-grid3-viewport'),
+ mainHd = mainWrap.child('div.x-grid3-header'),
+ scroller = mainWrap.child('div.x-grid3-scroller');
+
if (this.grid.hideHeaders) {
- this.lockedHd.setDisplayed(false);
- this.mainHd.setDisplayed(false);
+ lockedHd.setDisplayed(false);
+ mainHd.setDisplayed(false);
}
-
- this.innerHd = this.mainHd.dom.firstChild;
- this.scroller = new E(this.mainWrap.dom.childNodes[1]);
-
+
if(this.forceFit){
- this.scroller.setStyle('overflow-x', 'hidden');
+ scroller.setStyle('overflow-x', 'hidden');
}
-
- this.mainBody = new E(this.scroller.dom.firstChild);
- this.focusEl = new E(this.scroller.dom.childNodes[1]);
- this.resizeMarker = new E(cs[2]);
- this.resizeProxy = new E(cs[3]);
-
+
+ Ext.apply(this, {
+ el : el,
+ mainWrap: mainWrap,
+ mainHd : mainHd,
+ innerHd : mainHd.dom.firstChild,
+ scroller: scroller,
+ mainBody: scroller.child('div.x-grid3-body'),
+ focusEl : scroller.child('a'),
+ resizeMarker: el.child('div.x-grid3-resize-marker'),
+ resizeProxy : el.child('div.x-grid3-resize-proxy'),
+ lockedWrap: lockedWrap,
+ lockedHd: lockedHd,
+ lockedScroller: lockedScroller,
+ lockedBody: lockedScroller.child('div.x-grid3-body'),
+ lockedInnerHd: lockedHd.child('div.x-grid3-header-inner', true)
+ });
+
this.focusEl.swallowEvent('click', true);
},
@@ -4952,33 +4948,33 @@ Ext.ux.grid.LockingGridView = Ext.extend(Ext.grid.GridView, {
},
getCell : function(row, col){
- var llen = this.cm.getLockedCount();
- if(col < llen){
+ var lockedLen = this.cm.getLockedCount();
+ if(col < lockedLen){
return this.getLockedRow(row).getElementsByTagName('td')[col];
}
- return Ext.ux.grid.LockingGridView.superclass.getCell.call(this, row, col - llen);
+ return Ext.ux.grid.LockingGridView.superclass.getCell.call(this, row, col - lockedLen);
},
getHeaderCell : function(index){
- var llen = this.cm.getLockedCount();
- if(index < llen){
+ var lockedLen = this.cm.getLockedCount();
+ if(index < lockedLen){
return this.lockedHd.dom.getElementsByTagName('td')[index];
}
- return Ext.ux.grid.LockingGridView.superclass.getHeaderCell.call(this, index - llen);
+ return Ext.ux.grid.LockingGridView.superclass.getHeaderCell.call(this, index - lockedLen);
},
addRowClass : function(row, cls){
- var r = this.getLockedRow(row);
- if(r){
- this.fly(r).addClass(cls);
+ var lockedRow = this.getLockedRow(row);
+ if(lockedRow){
+ this.fly(lockedRow).addClass(cls);
}
Ext.ux.grid.LockingGridView.superclass.addRowClass.call(this, row, cls);
},
removeRowClass : function(row, cls){
- var r = this.getLockedRow(row);
- if(r){
- this.fly(r).removeClass(cls);
+ var lockedRow = this.getLockedRow(row);
+ if(lockedRow){
+ this.fly(lockedRow).removeClass(cls);
}
Ext.ux.grid.LockingGridView.superclass.removeRowClass.call(this, row, cls);
},
@@ -4989,29 +4985,30 @@ Ext.ux.grid.LockingGridView = Ext.extend(Ext.grid.GridView, {
},
removeRows : function(firstRow, lastRow){
- var bd = this.lockedBody.dom;
- for(var rowIndex = firstRow; rowIndex <= lastRow; rowIndex++){
- Ext.removeNode(bd.childNodes[firstRow]);
+ var lockedBody = this.lockedBody.dom,
+ rowIndex = firstRow;
+ for(; rowIndex <= lastRow; rowIndex++){
+ Ext.removeNode(lockedBody.childNodes[firstRow]);
}
Ext.ux.grid.LockingGridView.superclass.removeRows.call(this, firstRow, lastRow);
},
syncScroll : function(e){
- var mb = this.scroller.dom;
- this.lockedScroller.dom.scrollTop = mb.scrollTop;
+ this.lockedScroller.dom.scrollTop = this.scroller.dom.scrollTop;
Ext.ux.grid.LockingGridView.superclass.syncScroll.call(this, e);
},
updateSortIcon : function(col, dir){
- var sc = this.sortClasses,
- lhds = this.lockedHd.select('td').removeClass(sc),
- hds = this.mainHd.select('td').removeClass(sc),
- llen = this.cm.getLockedCount(),
- cls = sc[dir == 'DESC' ? 1 : 0];
- if(col < llen){
- lhds.item(col).addClass(cls);
+ var sortClasses = this.sortClasses,
+ lockedHeaders = this.lockedHd.select('td').removeClass(sortClasses),
+ headers = this.mainHd.select('td').removeClass(sortClasses),
+ lockedLen = this.cm.getLockedCount(),
+ cls = sortClasses[dir == 'DESC' ? 1 : 0];
+
+ if(col < lockedLen){
+ lockedHeaders.item(col).addClass(cls);
}else{
- hds.item(col - llen).addClass(cls);
+ headers.item(col - lockedLen).addClass(cls);
}
},
@@ -5180,18 +5177,7 @@ Ext.ux.grid.LockingGridView = Ext.extend(Ext.grid.GridView, {
lrow.className += ' x-grid3-row-alt';
}
}
- if(this.syncHeights){
- var el1 = Ext.get(row),
- el2 = Ext.get(lrow),
- h1 = el1.getHeight(),
- h2 = el2.getHeight();
-
- if(h1 > h2){
- el2.setHeight(h1);
- }else if(h2 > h1){
- el1.setHeight(h2);
- }
- }
+ this.syncRowHeights(row, lrow);
}
if(startRow === 0){
Ext.fly(rows[0]).addClass(this.firstRowCls);
@@ -5200,6 +5186,21 @@ Ext.ux.grid.LockingGridView = Ext.extend(Ext.grid.GridView, {
Ext.fly(rows[rows.length - 1]).addClass(this.lastRowCls);
Ext.fly(lrows[lrows.length - 1]).addClass(this.lastRowCls);
},
+
+ syncRowHeights: function(row1, row2){
+ if(this.syncHeights){
+ var el1 = Ext.get(row1),
+ el2 = Ext.get(row2),
+ h1 = el1.getHeight(),
+ h2 = el2.getHeight();
+
+ if(h1 > h2){
+ el2.setHeight(h1);
+ }else if(h2 > h1){
+ el1.setHeight(h2);
+ }
+ }
+ },
afterRender : function(){
if(!this.ds || !this.cm){
@@ -5215,20 +5216,24 @@ Ext.ux.grid.LockingGridView = Ext.extend(Ext.grid.GridView, {
this.grid.fireEvent('viewready', this.grid);
},
- renderUI : function(){
- var header = this.renderHeaders();
- var body = this.templates.body.apply({rows:' '});
- var html = this.templates.master.apply({
- body: body,
+ renderUI : function(){
+ var templates = this.templates,
+ header = this.renderHeaders(),
+ body = templates.body.apply({rows:' '});
+
+ return templates.masterTpl.apply({
+ body : body,
header: header[0],
- ostyle: 'width:'+this.getOffsetWidth()+';',
- bstyle: 'width:'+this.getTotalWidth()+';',
+ ostyle: 'width:' + this.getOffsetWidth() + ';',
+ bstyle: 'width:' + this.getTotalWidth() + ';',
lockedBody: body,
lockedHeader: header[1],
lstyle: 'width:'+this.getLockedWidth()+';'
});
+ },
+
+ afterRenderUI: function(){
var g = this.grid;
- g.getGridEl().dom.innerHTML = html;
this.initElements();
Ext.fly(this.innerHd).on('click', this.handleHdDown, this);
Ext.fly(this.lockedInnerHd).on('click', this.handleHdDown, this);
@@ -5303,7 +5308,7 @@ Ext.ux.grid.LockingGridView = Ext.extend(Ext.grid.GridView, {
ddGroup : g.ddGroup || 'GridDD'
});
}
- this.updateHeaderSortState();
+ this.updateHeaderSortState();
},
layout : function(){
@@ -5476,11 +5481,101 @@ Ext.ux.grid.LockingGridView = Ext.extend(Ext.grid.GridView, {
var markup = this.renderRows() || [' ', ' '];
return [this.templates.body.apply({rows: markup[0]}), this.templates.body.apply({rows: markup[1]})];
},
-
- refreshRow : function(record){
- Ext.ux.grid.LockingGridView.superclass.refreshRow.call(this, record);
- var index = Ext.isNumber(record) ? record : this.ds.indexOf(record);
- this.getLockedRow(index).rowIndex = index;
+
+ refreshRow: function(record){
+ var store = this.ds,
+ colCount = this.cm.getColumnCount(),
+ columns = this.getColumnData(),
+ last = colCount - 1,
+ cls = ['x-grid3-row'],
+ rowParams = {
+ tstyle: String.format("width: {0};", this.getTotalWidth())
+ },
+ lockedRowParams = {
+ tstyle: String.format("width: {0};", this.getLockedWidth())
+ },
+ colBuffer = [],
+ lockedColBuffer = [],
+ cellTpl = this.templates.cell,
+ rowIndex,
+ row,
+ lockedRow,
+ column,
+ meta,
+ css,
+ i;
+
+ if (Ext.isNumber(record)) {
+ rowIndex = record;
+ record = store.getAt(rowIndex);
+ } else {
+ rowIndex = store.indexOf(record);
+ }
+
+ if (!record || rowIndex < 0) {
+ return;
+ }
+
+ for (i = 0; i < colCount; i++) {
+ column = columns[i];
+
+ if (i == 0) {
+ css = 'x-grid3-cell-first';
+ } else {
+ css = (i == last) ? 'x-grid3-cell-last ' : '';
+ }
+
+ meta = {
+ id: column.id,
+ style: column.style,
+ css: css,
+ attr: "",
+ cellAttr: ""
+ };
+
+ 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 && record.dirty && typeof record.modified[column.name] != 'undefined') {
+ meta.css += ' x-grid3-dirty-cell';
+ }
+
+ if (column.locked) {
+ lockedColBuffer[i] = cellTpl.apply(meta);
+ } else {
+ colBuffer[i] = cellTpl.apply(meta);
+ }
+ }
+
+ row = this.getRow(rowIndex);
+ row.className = '';
+ lockedRow = this.getLockedRow(rowIndex);
+ lockedRow.className = '';
+
+ if (this.grid.stripeRows && ((rowIndex + 1) % 2 === 0)) {
+ cls.push('x-grid3-row-alt');
+ }
+
+ if (this.getRowClass) {
+ rowParams.cols = colCount;
+ cls.push(this.getRowClass(record, rowIndex, rowParams, store));
+ }
+
+ // Unlocked rows
+ this.fly(row).addClass(cls).setStyle(rowParams.tstyle);
+ rowParams.cells = colBuffer.join("");
+ row.innerHTML = this.templates.rowInner.apply(rowParams);
+
+ // Locked rows
+ this.fly(lockedRow).addClass(cls).setStyle(lockedRowParams.tstyle);
+ lockedRowParams.cells = lockedColBuffer.join("");
+ lockedRow.innerHTML = this.templates.rowInner.apply(lockedRowParams);
+ lockedRow.rowIndex = rowIndex;
+ this.syncRowHeights(row, lockedRow);
+ this.fireEvent('rowupdated', this, rowIndex, record);
},
refresh : function(headersToo){
@@ -5526,7 +5621,7 @@ Ext.ux.grid.LockingGridView = Ext.extend(Ext.grid.GridView, {
case 'lock':
if(cm.getColumnCount(true) <= llen + 1){
this.onDenyColumnLock();
- return;
+ return undefined;
}
cm.setLocked(index, true);
if(llen != index){
@@ -5563,13 +5658,18 @@ Ext.ux.grid.LockingGridView = Ext.extend(Ext.grid.GridView, {
},
syncHeaderHeight: function(){
- this.innerHd.firstChild.firstChild.style.height = 'auto';
- this.lockedInnerHd.firstChild.firstChild.style.height = 'auto';
- var hd = this.innerHd.firstChild.firstChild.offsetHeight,
- lhd = this.lockedInnerHd.firstChild.firstChild.offsetHeight,
- height = (lhd > hd ? lhd : hd) + 'px';
- this.innerHd.firstChild.firstChild.style.height = height;
- this.lockedInnerHd.firstChild.firstChild.style.height = height;
+ var hrow = Ext.fly(this.innerHd).child('tr', true),
+ lhrow = Ext.fly(this.lockedInnerHd).child('tr', true);
+
+ hrow.style.height = 'auto';
+ lhrow.style.height = 'auto';
+ var hd = hrow.offsetHeight,
+ lhd = lhrow.offsetHeight,
+ height = Math.max(lhd, hd) + 'px';
+
+ hrow.style.height = height;
+ lhrow.style.height = height;
+
},
updateLockedWidth: function(){
@@ -5677,8 +5777,7 @@ Ext.ux.grid.LockingColumnModel = Ext.extend(Ext.grid.ColumnModel, {
Ext.ux.grid.LockingColumnModel.superclass.moveColumn.apply(this, arguments);
}
-});
-Ext.ns('Ext.ux.form');
+});Ext.ns('Ext.ux.form');
/**
* @class Ext.ux.form.MultiSelect
@@ -8423,6 +8522,9 @@ Ext.ux.Spinner = Ext.extend(Ext.util.Observable, {
if (this.repeater) {
this.repeater.purgeListeners();
}
+ if (this.mimicing){
+ Ext.get(Ext.isIE ? document.body : document).un("mousedown", this.mimicBlur, this);
+ }
}
});
@@ -9761,8 +9863,8 @@ Ext.ux.tree.TreeGridNodeUI = Ext.extend(Ext.tree.TreeNodeUI, {
'',
'',
'', this.indentMarkup, "",
- '
',
- '
',
+ '',
+ '',
'',
'', (c.tpl ? c.tpl.apply(a) : a[c.dataIndex] || c.text), '',
@@ -9917,6 +10019,7 @@ Ext.tree.ColumnResizer = Ext.extend(Ext.util.Observable, {
},
onStart : function(e){
+ this.dragHeadersDisabled = this.tree.headersDisabled;
this.tree.headersDisabled = true;
this.proxy = this.tree.body.createChild({cls:'x-treegrid-resizer'});
this.proxy.setHeight(this.tree.body.getHeight());
@@ -9939,7 +10042,8 @@ Ext.tree.ColumnResizer = Ext.extend(Ext.util.Observable, {
onEnd : function(e){
var nw = this.proxy.getWidth(),
- tree = this.tree;
+ tree = this.tree,
+ disabled = this.dragHeadersDisabled;
this.proxy.remove();
delete this.dragHd;
@@ -9948,7 +10052,7 @@ Ext.tree.ColumnResizer = Ext.extend(Ext.util.Observable, {
tree.updateColumnWidths();
setTimeout(function(){
- tree.headersDisabled = false;
+ tree.headersDisabled = disabled;
}, 100);
}
});Ext.ns('Ext.ux.tree');
@@ -10001,30 +10105,34 @@ Ext.ux.tree.TreeGridSorter = Ext.extend(Ext.tree.TreeSorter, {
tree.on('headerclick', this.onHeaderClick, this);
tree.ddAppendOnly = true;
- me = this;
+ var me = this;
this.defaultSortFn = function(n1, n2){
- var dsc = me.dir && me.dir.toLowerCase() == 'desc';
- var p = me.property || 'text';
- var sortType = me.sortType;
- var fs = me.folderSort;
- var cs = me.caseSensitive === true;
- var leafAttr = me.leafAttr || 'leaf';
+ var desc = me.dir && me.dir.toLowerCase() == 'desc',
+ prop = me.property || 'text',
+ sortType = me.sortType,
+ caseSensitive = me.caseSensitive === true,
+ leafAttr = me.leafAttr || 'leaf',
+ attr1 = n1.attributes,
+ attr2 = n2.attributes;
- if(fs){
- if(n1.attributes[leafAttr] && !n2.attributes[leafAttr]){
+ if(me.folderSort){
+ if(attr1[leafAttr] && !attr2[leafAttr]){
return 1;
}
- if(!n1.attributes[leafAttr] && n2.attributes[leafAttr]){
+ if(!attr1[leafAttr] && attr2[leafAttr]){
return -1;
}
}
- var v1 = sortType ? sortType(n1) : (cs ? n1.attributes[p] : n1.attributes[p].toUpperCase());
- var v2 = sortType ? sortType(n2) : (cs ? n2.attributes[p] : n2.attributes[p].toUpperCase());
+ var prop1 = attr1[prop],
+ prop2 = attr2[prop],
+ v1 = sortType ? sortType(prop1) : (caseSensitive ? prop1 : prop1.toUpperCase());
+ v2 = sortType ? sortType(prop2) : (caseSensitive ? prop2 : prop2.toUpperCase());
+
if(v1 < v2){
- return dsc ? +1 : -1;
+ return desc ? +1 : -1;
}else if(v1 > v2){
- return dsc ? -1 : +1;
+ return desc ? -1 : +1;
}else{
return 0;
}
@@ -10073,8 +10181,8 @@ Ext.ux.tree.TreeGridSorter = Ext.extend(Ext.tree.TreeSorter, {
// private
updateSortIcon : function(col, dir){
- var sc = this.sortClasses;
- var hds = this.tree.innerHd.select('td').removeClass(sc);
+ var sc = this.sortClasses,
+ hds = this.tree.innerHd.select('td').removeClass(sc);
hds.item(col).addClass(sc[dir == 'desc' ? 1 : 0]);
}
});/**
@@ -10124,14 +10232,6 @@ Ext.ux.tree.TreeGrid = Ext.extend(Ext.tree.TreePanel, {
}else if(Ext.isObject(l) && !l.load){
l = new Ext.ux.tree.TreeGridLoader(l);
}
- else if(l) {
- l.createNode = function(attr) {
- if (!attr.uiProvider) {
- attr.uiProvider = Ext.ux.tree.TreeGridNodeUI;
- }
- return Ext.tree.TreeLoader.prototype.createNode.call(this, attr);
- }
- }
this.loader = l;
Ext.ux.tree.TreeGrid.superclass.initComponent.call(this);
@@ -10153,7 +10253,7 @@ Ext.ux.tree.TreeGrid = Ext.extend(Ext.tree.TreePanel, {
'
{lockedHeader}
',
'
',
'',
'
',
'',
- '
',
+ '
',
'
| ', @@ -10163,7 +10263,7 @@ Ext.ux.tree.TreeGrid = Ext.extend(Ext.tree.TreePanel, { '', ' |
',
@@ -10222,7 +10322,7 @@ Ext.ux.tree.TreeGrid = Ext.extend(Ext.tree.TreePanel, {
this.colgroupTpl.insertFirst(this.innerCt, {columns: this.columns});
if(this.hideHeaders){
- this.header.dom.style.display = 'none';
+ this.el.child('.x-grid3-header').setDisplayed('none');
}
else if(this.enableHdMenu !== false){
this.hmenu = new Ext.menu.Menu({id: this.id + '-hctx'});