gridx-rails 1.2.1 → 1.3.0.pre.alpha

data/app/assets/javascripts/gridx/modules/PagedBody.js

@@ -1,23 +1,17 @@
 define([
 	"dojo/_base/declare",
-	"dojo/_base/lang",
 	"dojo/query",
-	"dojo/_base/array",
 	"dojo/dom-construct",
 	"dojo/dom-class",
-	"dojo/_base/Deferred",
-	"dojo/_base/sniff",
 	"dojo/keys",
-	"dijit/a11y",
 	"./Body",
-	"dojo/touch",
-	"dojo/i18n",
-	"dojo/i18n!../nls/Body"
-], function(declare, lang, query, array, domConstruct, domClass, Deferred, has, keys, a11y, Body, touch, i18n){
+	"./_PagedBodyMixin"
+], function(declare, query, domConstruct, domClass, keys, Body, _PagedBodyMixin){
 
 /*=====
 	return declare(Body, {
 		// summary:
+		//		module name: body.
 		//		This module provides a "load more" button (and a "load previous" button if necessary) inside grid body.
 		// description:
 		//		Page size can be set to indicate how many rows to show in one page. Clicking "load more" button or 
@@ -30,99 +24,19 @@ define([
 		//		The max allowed page count. If this value > 0, when visible pages exceeds this value, some previous pages will be destroyed
 		//		and the "load previous" button will be shown. If this value <= 0, grid will never destroy and previous pages, 
 		//		and the "load previous" button will never be shown. Default to 0.
-		maxPageCount: 0,
-
-		// pageSize: Integer
-		//		The row count in one page. Default to the pageSize of grid cache. If using cache has no pageSize, default to 20.
-		//		Users can directly set grid parameter pageSize to set both the cache pageSize and the body pageSize.
-		//		If using bodyPageSize, it'll be different from the cache page size, but that's also okay.
-		pageSize: 20,
+		maxPageCount: 0
 	});
 =====*/
 
-	return declare(Body, {
+	return declare([Body, _PagedBodyMixin], {
 		maxPageCount: 0,
 
-		preload: function(){
-			var t = this,
-				g = t.grid,
-				view = g.view;
-			t._nls = i18n.getLocalization('gridx', 'Body', g.lang);
-			view.paging = 1;
-			view.rootStart = 0;
-			view.rootCount = this.arg('pageSize', t.model._cache.pageSize || 20);
-			domClass.remove(t.domNode, 'gridxBodyRowHoverEffect');
-			t.connect(t.domNode, 'onscroll', function(e){
-				g.hScrollerNode.scrollLeft = t.domNode.scrollLeft;
-			});
-
-			t._moreNode = domConstruct.create('div', {
-				'class': 'gridxLoadMore'
-			});
-			t.arg('createMoreNode').call(t, t._moreNode);
-			t._prevNode = domConstruct.create('div', {
-				'class': 'gridxLoadMore'
-			});
-			t.arg('createPrevNode').call(t, t._prevNode);
-
-			t.connect(t._moreNode, 'onmouseover', function(){
-				query('> .gridxRowOver', t.domNode).removeClass('gridxRowOver');
-			});
-			t.connect(t._prevNode, 'onmouseover', function(){
-				query('> .gridxRowOver', t.domNode).removeClass('gridxRowOver');
-			});
-			t._initFocus();
-		},
-
-		_initFocus: function(){
-			var t = this,
-				focus = t.grid.focus,
-				doFocus = function(node, evt, step){
-					if(node.parentNode){
-						focus.stopEvent(evt);
-						var elems = a11y._getTabNavigable(node),
-							n = elems[step < 0 ? 'last' : 'first'];
-						if(n){
-							n.focus();
-						}
-						return !!n;
-					}else{
-						return false;
-					}
-				},
-				doBlur = function(node, evt, step){
-					if(node.parentNode){
-						var elems = a11y._getTabNavigable(node);
-						return evt ? evt.target == (step < 0 ? elems.first : elems.last) : true;
-					}else{
-						return true;
-					}
-				};
-			t.inherited(arguments);
-			focus.registerArea({
-				name: 'prevBtn',
-				priority: 0.9999,
-				focusNode: t._prevNode,
-				scope: t,
-				doFocus: lang.partial(doFocus, t._prevNode),
-				doBlur: lang.partial(doBlur, t._prevNode)
-			});
-			focus.registerArea({
-				name: 'moreBtn',
-				priority: 1.0001,
-				focusNode: t._moreNode,
-				scope: t,
-				doFocus: lang.partial(doFocus, t._moreNode),
-				doBlur: lang.partial(doBlur, t._moreNode)
-			});
-		},
-
-		createMoreNode: function(moreNode){
+		createBottom: function(bottomNode){
 			var t = this,
 				moreBtn = t._moreBtn = domConstruct.create('button', {
-					innerHTML: t.arg('loadMoreLabel', t._nls.loadMore)
-				}, moreNode, 'last');
-			t.connect(moreBtn, touch.press, function(){
+					innerHTML: t.arg('loadMoreLabel', t.grid.nls.loadMore)
+				}, bottomNode, 'last');
+			t.connect(moreBtn, 'onclick', function(){
 				t._load(1);
 			});
 			t.connect(moreBtn, 'onkeydown', function(evt){
@@ -132,12 +46,12 @@ define([
 			});
 		},
 
-		createPrevNode: function(prevNode){
+		createTop: function(topNode){
 			var t = this,
 				prevBtn = t._prevBtn = domConstruct.create('button', {
-					innerHTML: t.arg('loadPreviousLabel', t._nls.loadPrevious)
-				}, t._prevNode, 'last');
-			t.connect(prevBtn, touch.press, function(){
+					innerHTML: t.arg('loadPreviousLabel', t.grid.nls.loadPrevious)
+				}, topNode, 'last');
+			t.connect(prevBtn, 'onclick', function(){
 				t._load();
 			});
 			t.connect(prevBtn, 'onkeydown', function(evt){
@@ -147,216 +61,12 @@ define([
 			});
 		},
 
-		load: function(args){
-			var t = this,
-				view = t.grid.view;
-			t.aspect(t.model, 'onDelete', '_onDelete');
-			if(view._err){
-				t._loadFail(view._err);
-			}
-			t.loaded.callback();
-		},
-
-		refresh: function(start){
-			var t = this,
-				loadingNode = t.grid.loadingNode,
-				d = new Deferred();
-			delete t._err;
-			domClass.add(loadingNode, 'gridxLoading');
-			t.grid.view.updateVisualCount().then(function(){
-				try{
-					t.renderStart = 0;
-					var rc = t.renderCount = t.grid.view.visualCount;
-					if(typeof start == 'number' && start >= 0){
-						var count = rc - start,
-							n = query('> [visualindex="' + start + '"]', t.domNode)[0],
-							uncachedRows = [],
-							renderedRows = [],
-							rows = t._buildRows(start, count, uncachedRows, renderedRows);
-						if(rows){
-							domConstruct.place(rows, n || t._moreNode, 'before');
-						}
-						while(n && n !== t._moreNode){
-							var tmp = n.nextSibling,
-								vidx = parseInt(n.getAttribute('visualindex'), 10),
-								id = n.getAttribute('rowid');
-							domConstruct.destroy(n);
-							if(vidx >= start + count){
-								t.onUnrender(id);
-							}
-							n = tmp;
-						}
-						array.forEach(renderedRows, t.onAfterRow, t);
-						Deferred.when(t._buildUncachedRows(uncachedRows), function(){
-							t.onRender(start, count);
-							domClass.remove(loadingNode, 'gridxLoading');
-							d.callback();
-						});
-					}else{
-						t.renderRows(0, rc, 0, 1);
-						domClass.remove(loadingNode, 'gridxLoading');
-						d.callback();
-					}
-				}catch(e){
-					t._loadFail(e);
-					domClass.remove(loadingNode, 'gridxLoading');
-					d.errback(e);
-				}
-			}, function(e){
-				t._loadFail(e);
-				domClass.remove(loadingNode, 'gridxLoading');
-				d.errback(e);
-			});
-			return d;
-		},
-
-		renderRows: function(start, count, position){
-			var t = this,
-				g = t.grid,
-				uncachedRows = [],
-				renderedRows = [],
-				n = t.domNode,
-				en = g.emptyNode;
-			if(t._err){
-				return;
-			}
-			if(count > 0){
-				en.innerHTML = t.arg('loadingInfo', t._nls.loadingInfo);
-				en.style.zIndex = '';
-				var str = t._buildRows(start, count, uncachedRows, renderedRows);
-				t.renderStart = start;
-				t.renderCount = count;
-				n.scrollTop = 0;
-				if(has('ie')){
-					//In IE, setting innerHTML will completely destroy the node,
-					//But CellWidget still need it.
-					while(n.childNodes.length){
-						n.removeChild(n.firstChild);
-					}
-				}
-				n.innerHTML = str;
-				if(g.view.rootStart + g.view.rootCount < g.model.size()){
-					n.appendChild(t._moreNode);
-				}
-				n.scrollLeft = g.hScrollerNode.scrollLeft;
-				if(!str){
-					en.style.zIndex = 1;
-				}else{
-					en.innerHTML = '';
-				}
-				t.onUnrender();
-				array.forEach(renderedRows, t.onAfterRow, t);
-				Deferred.when(t._buildUncachedRows(uncachedRows), function(){
-					t.onRender(start, count);
-				});
-			}else if(!{top: 1, bottom: 1}[position]){
-				n.scrollTop = 0;
-				if(has('ie')){
-					//In IE, setting innerHTML will completely destroy the node,
-					//But CellWidget still need it.
-					while(n.childNodes.length){
-						n.removeChild(n.firstChild);
-					}
-				}
-				n.innerHTML = '';
-				en.innerHTML = t.arg('emptyInfo', t._nls.emptyInfo);
-				en.style.zIndex = 1;
-				t.onUnrender();
-				t.onEmpty();
-				t.model.free();
-			}
-		},
-
-		onRender: function(/*start, count*/){
-			//FIX #8746
-			var bn = this.domNode;
-			if(has('ie') < 9 && bn.childNodes.length){
-				query('> gridxLastRow', bn).removeClass('gridxLastRow');
-				if(bn.lastChild !== this._moreNode){
-					domClass.add(bn.lastChild, 'gridxLastRow');
-				}
-			}
-		},
-
-		_load: function(isPost){
-			var t = this,
-				g = t.grid,
-				m = t.model,
-				view = g.view,
-				pageSize = t.arg('pageSize'),
-				btnNode = isPost ? t._moreNode : t._prevNode,
-				start = view.rootStart,
-				count = view.rootCount,
-				newRootStart = isPost ? start : start < pageSize ? 0 : start - pageSize,
-				newRootCount = isPost ? count + pageSize : start + count - newRootStart,
-				finish = function(renderStart, renderCount){
-					t._busy(isPost);
-					t._checkSize(!isPost, function(){
-						query('.gridxBodyFirstRow').removeClass('gridxBodyFirstRow');
-						var firstRow = t._prevNode.nextSibling;
-						if(firstRow && firstRow != t._moreNode){
-							domClass.add(firstRow, 'gridxBodyFirstRow');
-						}
-						t.onRender(renderStart, renderCount);
-					});
-				};
-			t._busy(isPost, 1);
-			m.when({
-				start: isPost ? start + count : newRootStart,
-				count: isPost ? pageSize : start - newRootStart
-			}, function(){
-				var totalCount = m.size();
-				if(isPost && newRootStart + newRootCount > totalCount){
-					newRootCount = totalCount - newRootStart;
-				}
-				view.updateRootRange(newRootStart, newRootCount).then(function(){
-					var renderStart = isPost ? t.renderCount : 0,
-						renderCount = view.visualCount - t.renderCount;
-					t.renderStart = 0;
-					t.renderCount = view.visualCount;
-					if(renderCount){
-						var toFetch = [];
-						for(var i = 0; i < renderCount; ++i){
-							var rowInfo = view.getRowInfo({visualIndex: renderStart + i});
-							if(!m.isId(rowInfo.id)){
-								toFetch.push({
-									parentId: rowInfo.parentId,
-									start: rowInfo.rowIndex,
-									count: 1
-								});
-							}
-						}
-						m.when(toFetch, function(){
-							var renderedRows = [],
-								scrollHeight = g.bodyNode.scrollHeight;
-							str = t._buildRows(renderStart, renderCount, [], renderedRows);
-							domConstruct.place(str, btnNode, isPost ? 'before' : 'after');
-							if(!isPost){
-								g.bodyNode.scrollTop += g.bodyNode.scrollHeight - scrollHeight;
-							}
-							if(isPost ? view.rootStart + view.rootCount >= totalCount : view.rootStart === 0){
-								t.domNode.removeChild(btnNode);
-							}
-							array.forEach(renderedRows, t.onAfterRow, t);
-							finish(renderStart, renderCount);
-						});
-					}else{
-						t.domNode.removeChild(btnNode);
-						if(!isPost){
-							query('.gridxBodyFirstRow').removeClass('gridxBodyFirstRow');
-						}
-						finish(renderStart, renderCount);
-					}
-				});
-			});
-		},
-
-		_checkSize: function(isPost, onFinish){
+		_onLoadFinish: function(isPost, start, count, onFinish){
 			var t = this,
 				view = t.grid.view,
 				maxPageCount = t.arg('maxPageCount'),
 				maxRowCount = maxPageCount * t.arg('pageSize'),
-				btnNode = isPost ? t._moreNode : t._prevNode;
+				btnNode = isPost ? t._bottomNode : t._topNode;
 			if(maxPageCount > 0 && view.rootCount > maxRowCount){
 				var newRootStart = isPost ? view.rootStart : view.rootStart + view.rootCount - maxRowCount;
 				view.updateRootRange(newRootStart, maxRowCount).then(function(){
@@ -368,6 +78,7 @@ define([
 					t.renderCount = view.visualCount;
 					query('.gridxRow', t.domNode).forEach(function(node, i){
 						node.setAttribute('visualindex', i);
+						domClass.toggle(node, 'gridxRowOdd', i % 2);
 					});
 					domConstruct.place(btnNode, t.domNode, isPost ? 'last' : 'first');
 					if(!isPost){
@@ -385,25 +96,13 @@ define([
 				btn = isPost ? t._moreBtn : t._prevBtn,
 				cls = isPost ? "More" : "Previous";
 			btn.innerHTML = begin ?
-				'<span class="gridxLoadingMore"></span>' + t.arg('load' + cls + 'LoadingLabel', t._nls['load' + cls + 'Loading']) :
-				t.arg('load' + cls + 'Label', t._nls['load' + cls]);
+				'<span class="gridxLoadingMore"></span>' + t.arg('load' + cls + 'LoadingLabel', t.grid.nls['load' + cls + 'Loading']) :
+				t.arg('load' + cls + 'Label', t.grid.nls['load' + cls]);
 			btn.disabled = !!begin;
-		},
+		}/*,
 
-		_onDelete: function(id){
-			var t = this,
-				view = t.grid.view;
-			if(t.autoUpdate){
-				var node = t.getRowNode({rowId: id});
-				if(node){
-					var parentId = node.getAttribute('parentid'),
-						rowIndex = parseInt(node.getAttribute('rowindex'), 10);
-					if(parentId === '' && rowIndex >= view.rootStart && rowIndex < view.rootStart + view.rootCount){
-						view.updateRootRange(view.rootStart, view.rootCount - 1);
-					}
-				}
-			}
-			t.inherited(arguments);
-		}
+		_checkSpace: function(){
+			return this.inherited(arguments) && this.renderCount < this.arg('maxPageCount') * this.arg('pageSize');
+		}*/
 	});
 });

data/app/assets/javascripts/gridx/modules/Puller.js

@@ -0,0 +1,113 @@
+define([
+	"dojo/_base/declare",
+	"dojo/query",
+	"dojo/_base/lang",
+	"dojo/_base/sniff",
+	"dojo/aspect",
+	"dojo/dom-construct",
+	"dojo/dom-class",
+	"dojo/dom-style",
+	"dojo/dom-geometry",
+	"dojo/keys",
+	"../core/_Module"
+], function(declare, query, lang, has, aspect, domConstruct, domClass, domStyle, domGeo, keys, _Module){
+
+	return _Module.register(
+	declare(_Module, {
+		name: 'puller',
+
+		forced: ['vScroller'],
+		//node: null,
+
+		load: function(){
+			this.bind(this.arg('node'));
+			this.loaded.callback();
+		},
+
+		bind: function(node){
+			var t = this;
+			var g = t.grid;
+			t.unbind();
+			if(node && node != t.node){
+				t.node = node;
+				t.innerNode = node.firstChild;
+				g.vScroller.loaded.then(function(){
+					var scrollable = g.vScroller._scrollable;
+					if(scrollable){
+						t._height = t.node.clientHeight;
+						t._binds = [
+							t.aspect(scrollable, 'onTouchStart', function(){
+								t.node.style.height = t.node.clientHeight + 'px';
+								domClass.add(t.node, 'gridxPuller');
+								domClass.add(t.innerNode, 'gridxPullerInner');
+								t._pos = scrollable.getPos();
+								t._stage = 1;
+							}),
+							t.aspect(scrollable, 'scrollTo', function(to){
+								if(typeof to.y == 'number' && t._stage == 1){
+									var delta = to.y - t._pos.y;
+									var oldh = t.node.clientHeight;
+									var h = oldh + delta;
+									if(h < 0){
+										h = 0;
+									}else if(h > t._height){
+										h = t._height;
+									}
+									delta = h - oldh;
+									t._pos = to;
+									t.node.style.height = h + 'px';
+									g.mainNode.style.height = (g.mainNode.clientHeight - delta) + 'px';
+									g.vLayout.reLayout();
+								}
+							}),
+							t.aspect(scrollable, 'onTouchEnd', function(){
+								if(t.node.clientHeight < t._height / 2){
+									t._slide(0);
+								}else if(t.node.clientHeight >= t._height / 2){
+									t._slide(1);
+								}else{
+									t._stage = 0;
+								}
+							}, t, 'before')
+						];
+					}
+				});
+			}
+		},
+
+		unbind: function(){
+			var t = this;
+			if(t._binds){
+				for(var i = 0; i < t._binds.length; ++i){
+					t._binds[i].remove();
+				}
+				domClass.remove(t.node, 'gridxPuller');
+				domClass.remove(t.innerNode, 'gridxPullerInner');
+				t.node.style.height = '';
+				t.grid.vLayout.reLayout();
+				t._binds = t.node = null;
+			}
+		},
+
+		_slide: function(toShow){
+			var t = this;
+			var g = t.grid;
+			var targetHeight = toShow ? t._height : 0;
+			t._stage = 2;
+			domClass.add(t.node, 'gridxPullerAnim');
+			domClass.add(g.mainNode, 'gridxPullerAnim');
+			setTimeout(function(){
+				var h = t.node.offsetHeight - targetHeight;
+				t.node.style.height = targetHeight + 'px';
+				g.mainNode.style.height = (g.mainNode.clientHeight + h) + 'px';
+				setTimeout(function(){
+					domClass.remove(t.node, 'gridxPullerAnim');
+					domClass.remove(g.mainNode, 'gridxPullerAnim');
+					g.vLayout.reLayout();
+					t._stage = 0;
+				}, 500);
+			}, 10);
+		}
+	}));
+
+});

data/app/assets/javascripts/gridx/modules/RowHeader.js

@@ -1,6 +1,7 @@
 define([
 	"dojo/_base/declare",
-	"dojo/query",
+	// "dojo/query",
+	'gridx/support/query',
 	"dojo/_base/lang",
 	"dojo/_base/sniff",
 	"dojo/aspect",
@@ -50,10 +51,7 @@ define([
 			this.headerNode = domConstruct.create('div', {
 				'class': 'gridxRowHeaderHeader',
 				role: 'row',
-				innerHTML: ['<table role="presentation" border="0" cellspacing="0" cellpadding="0" style="width: ', 
-					this.arg('width'), 
-					';"><tr><td class="gridxRowHeaderHeaderCell" role="rowheader" tabindex="-1"></td></tr></table>'
-				].join('')
+				innerHTML: '<table role="presentation" border="0" cellspacing="0" cellpadding="0" style="width: 100%;"><tr><td class="gridxRowHeaderHeaderCell" role="rowheader" tabindex="-1"></td></tr></table>'
 			});
 			this.bodyNode = domConstruct.create('div', {
 				'class': 'gridxRowHeaderBody'
@@ -369,6 +367,7 @@ define([
 				if(domClass.contains(node, 'gridxRowHeaderRow')){
 					var r = t.grid.body._focusCellRow = parseInt(node.getAttribute('visualindex'), 10);
 					t._focusRow(r);
+					t._onScroll();
 					return true;
 				}
 				node = node.parentNode;
@@ -396,15 +395,17 @@ define([
 
 		_onKeyDown: function(evt){
 			var t = this, g = t.grid;
-			if(g.focus.currentArea() == 'rowHeader' && 
+			if(!t._busy && g.focus.currentArea() == 'rowHeader' && 
 					evt.keyCode == keys.UP_ARROW || evt.keyCode == keys.DOWN_ARROW){
 				g.focus.stopEvent(evt);
 				var step = evt.keyCode == keys.UP_ARROW ? -1 : 1,
 					body = g.body,
 					r = body._focusCellRow + step;
 				body._focusCellRow = r = r < 0 ? 0 : (r >= g.view.visualCount ? g.view.visualCount - 1 : r);
+				t._busy = 1;
 				g.vScroller.scrollToRow(r).then(function(){
 					t._focusRow(r);
+					t._busy = 0;
 					t.onMoveToRowHeaderCell(r, evt);
 				});
 			}

data/app/assets/javascripts/gridx/modules/RowLock.js

@@ -5,7 +5,7 @@ define([
 	"dojo/_base/declare",
 	"dojo/_base/array",
 	"dojo/dom-class",
-	'dojo/aspect',
+	"dojo/aspect",
 	"dojo/query"
 ], function(kernel, lang, _Module, declare, array, domClass, aspect, query){
 	kernel.experimental('gridx/modules/RowLock');
@@ -36,26 +36,41 @@ define([
 		count: 0,
 		load: function(args, deferStartup){
 			this.count = this.arg('count');
-			var _this = this, 
-				g = this.grid;
+			var _this = this, g = this.grid;
 			
 			deferStartup.then(function(){
 				
-				if(_this.grid.vScroller)_this.connect(g.vScrollerNode, 'onscroll', function(){
-					_this._updatePosition();
-				});
+				if(_this.grid.vScroller){
+					_this.connect(g.vScrollerNode, 'onscroll', function(){
+						_this._updateRowPosition();
+					});
+				}
+				
+				if(_this.grid.vScroller && _this.grid.rowHeader){
+					_this.connect(g.bodyNode, 'onscroll', function(){
+						_this._updateRowHeaderPosition();
+					});
+				}
+
+				if(g.columnResizer){
+					//make it compatible with column resizer
+					_this.connect(g.columnResizer, 'onResize', '_adjustBody');
+					_this.connect(g.columnResizer, 'onResize', '_updatePosition');
+				}
+
+
 				
 				_this.lock(_this.count);
 				_this.loaded.callback();
 			});
+			
 			aspect.before(g.body, 'refresh', function(){
 				_this.grid.bodyNode.style.paddingTop = '0px';
 			});
-			
+
 			this.connect(g.body, 'refresh', function(){
 				//FIX ME
 				//the lock can't run before vscroll._doScroll()
-				_this.grid.bodyNode.style.paddingTop = '0px';
 				setTimeout(function(){
 					_this.lock(_this.count);
 				}, 0);
@@ -74,6 +89,8 @@ define([
 			
 			this._adjustBody();
 			this._updatePosition();
+
+			
 		},
 		
 		unlock: function(){
@@ -104,10 +121,19 @@ define([
 			this.grid.bodyNode.style.paddingTop = h + 'px';
 			if(this.grid.rowHeader){
 				this.grid.rowHeader.bodyNode.style.paddingTop = h + 'px';			
-			} 
+			}
 		},
 		
 		_updatePosition: function(){
+			// summary:
+			//	Update position of locked rows so that they look like locked.
+			this._updateRowPosition();
+			if(this.grid.rowHeader){
+				this._updateRowHeaderPosition();
+			}
+		},
+		
+		_updateRowPosition: function(){
 			// summary:
 			//	Update position of locked rows so that they look like locked.
 			if(!this.count){return;}
@@ -115,28 +141,32 @@ define([
 			this._foreachLockedRows(function(node){
 				node.style.top = t + h + 'px';
 				h += node.offsetHeight;
-			}, function(rowHeaderNode){
+			}, null);
+		},
+		
+		_updateRowHeaderPosition: function(){
+			// summary:
+			//	Update position of locked rowHeaders so that they look like locked.
+			if(!this.count){return;}
+			var t = this.grid.bodyNode.scrollTop, h = 0, _this = this;
+			this._foreachLockedRows(null, function(rowHeaderNode){
 				rowHeaderNode.style.top = t + h + 'px';
+				h += rowHeaderNode.offsetHeight;
 			});
 		},
-		
+				
 		_foreachLockedRows: function(callback, rowHeaderCallback){
-			rowHeaderCallback = rowHeaderCallback? rowHeaderCallback : callback;
+			// rowHeaderCallback = rowHeaderCallback? rowHeaderCallback : callback;
 			var nodes = this.grid.bodyNode.childNodes;
 			var rowHeaderNodes = this.grid.rowHeader? this.grid.rowHeader.bodyNode.childNodes : [];
 			for(var i = 0; i < this.count; i++){
-				if(rowHeaderNodes[i]){
+				if(rowHeaderNodes[i] && rowHeaderCallback){
 					rowHeaderCallback(rowHeaderNodes[i]);
 				}
-				if(nodes[i]){
+				if(nodes[i] && callback){
 					callback(nodes[i]);
 				}
 			}
-		},
-		
-		_restoreLock: function(){
-			console.log('restore lock')
-			this.lock(this.count);
 		}
 		
 	});