gridx-rails 1.2.1 → 1.3.0.pre.alpha

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

@@ -1,13 +1,12 @@
 define([
 	"dojo/_base/kernel",
 	"dojo/_base/Deferred",
-	"dojo/_base/sniff",
 	"dojo/_base/declare",
 	"dojo/query",
 	"dojo/dom-class",
 	"./VScroller",
 	"dojox/mobile/scrollable"
-], function(kernel, Deferred, has, declare, query, domClass, VScroller, Scrollable){
+], function(kernel, Deferred, declare, query, domClass, VScroller, Scrollable){
 	kernel.experimental('gridx/modules/TouchVScroller');
 
 /*=====
@@ -22,18 +21,17 @@ define([
 
 	return declare(VScroller, {
 		constructor: function(){
-			if(has('ios') || has('android') || this.arg('touch')){
+			if(this.grid.touch){
 				domClass.add(this.grid.domNode, 'gridxTouchVScroller');
 				this.domNode.style.width = '';
 			}
 		},
 
 		scrollToRow: function(rowVisualIndex, toTop){
-			if(has('ios') || has('android') || this.arg('touch')){
+			if(this.grid.touch){
 				var d = new Deferred(),
 					rowNode = query('[visualindex="' + rowVisualIndex + '"]', this.grid.bodyNode)[0];
 				if(rowNode){
-					console.log('scroll into view: ' + rowNode.getAttribute('rowid'));
 					this._scrollable.scrollIntoView(rowNode, toTop);
 				}
 				d.callback();
@@ -43,7 +41,7 @@ define([
 		},
 
 		scroll: function(top){
-			if(has('ios') || has('android') || this.arg('touch')){
+			if(this.grid.touch){
 				this._scrollable.scrollTo({ y: top });
 			}else{
 				this.inherited(arguments);
@@ -51,7 +49,7 @@ define([
 		},
 
 		position: function(){
-			if(has('ios') || has('android') || this.arg('touch')){
+			if(this.grid.touch){
 				return this._scrollable.getPos().y;
 			}else{
 				return this.inherited(arguments);
@@ -59,25 +57,36 @@ define([
 		},
 
 		_init: function(){
-			if(has('ios') || has('android') || this.arg('touch')){
+			if(this.grid.touch){
 				var t = this,
 					g = t.grid,
 					view = g.view,
 					h = g.header.innerNode,
 					mainNode = g.mainNode,
 					bodyNode = g.bodyNode,
-					headerTable = h.firstChild,
 					scrollable = t._scrollable = new Scrollable();
-				h.style.height = headerTable.offsetHeight + 'px';
+				h.style.height = h.firstChild.offsetHeight + 'px';
 				scrollable.init({
 					domNode: mainNode,
 					containerNode: bodyNode,
 					scrollDir: g.hScrollerNode.style.display == 'none' ? 'v' : 'vh',
 					noResize: true
 				});
+				function getLayerParent(){
+					var layerParent = g.layer && g.layer._wrapper1.firstChild;
+					return layerParent && layerParent.firstChild;
+				}
 				t.aspect(scrollable, 'scrollTo', function(to){
 					if(typeof to.x == "number"){
-						headerTable.style.webkitTransform = scrollable.makeTranslateStr({x: to.x});
+						var translateStr = scrollable.makeTranslateStr({x: to.x});
+						h.firstChild.style.webkitTransform = translateStr;
+						h.firstChild.style.transform = translateStr;
+
+						var layerParent = getLayerParent();
+						if(layerParent){
+							layerParent.style.webkitTransform = translateStr;
+							layerParent.style.transform = translateStr;
+						}
 					}
 				});
 				t.aspect(scrollable, 'slideTo', function(to, duration, easing){
@@ -85,10 +94,24 @@ define([
 						x: scrollable.getPos().x
 					}, {
 						x: to.x
-					}, duration, easing, headerTable, 2);	//2 means it's a containerNode
+					}, duration, easing, h.firstChild, 2);	//2 means it's a containerNode
+
+					var layerParent = getLayerParent();
+					if(layerParent){
+						scrollable._runSlideAnimation({
+							x: scrollable.getPos().x
+						}, {
+							x: to.x
+						}, duration, easing, layerParent, 2);	//2 means it's a containerNode
+					}
 				});
 				t.aspect(scrollable, 'stopAnimation', function(){
-					domClass.remove(headerTable, 'mblScrollableScrollTo2');
+					domClass.remove(h.firstChild, 'mblScrollableScrollTo2');
+
+					var layerParent = getLayerParent();
+					if(layerParent){
+						domClass.remove(layerParent, 'mblScrollableScrollTo2');
+					}
 				});
 				t.aspect(g.hScroller, 'refresh', function(){
 					scrollable._h = bodyNode.scrollWidth > mainNode.clientWidth;

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

@@ -1,5 +1,4 @@
 define([
-	"dojo/_base/kernel",
 	"dojo/_base/declare",
 	"dojo/_base/array",
 	"dojo/dom-class",
@@ -12,8 +11,7 @@ define([
 	"../core/_Module"
 //    "dojo/NodeList-dom",
 //    "dojo/NodeList-traverse"
-], function(kernel, declare, array, domClass, domGeometry, lang, Deferred, DeferredList, query, keys, _Module){
-	kernel.experimental('gridx/modules/Tree');
+], function(declare, array, domClass, domGeometry, lang, Deferred, DeferredList, query, keys, _Module){
 
 /*=====
 	Row.canExpand = function(){
@@ -360,7 +358,7 @@ define([
 		},
 
 		isExpanded: function(id){
-			return !!this.grid.view._openInfo[id];
+			return this.model.isId(id) && !!this.grid.view._openInfo[id];
 		},
 
 		isPaddingCell: function(rowId, colId){
@@ -381,7 +379,7 @@ define([
 		expand: function(id, skipUpdateBody){
 			var d = new Deferred(),
 				t = this;
-			if(id && !t.isExpanded(id) && t.canExpand(id)){
+			if(!t.isExpanded(id) && t.canExpand(id)){
 				t._beginLoading(id);
 				t.grid.view.logicExpand(id).then(function(){
 					Deferred.when(t._updateBody(id, skipUpdateBody, true), function(){
@@ -399,7 +397,7 @@ define([
 		collapse: function(id, skipUpdateBody){
 			var d = new Deferred(),
 				t = this;
-			if(id && t.isExpanded(id)){
+			if(t.isExpanded(id)){
 				t.grid.view.logicCollapse(id);
 				Deferred.when(t._updateBody(id, skipUpdateBody), function(){
 					d.callback();
@@ -555,7 +553,7 @@ define([
 			var rowNode = this.grid.body.getRowNode({rowId: id}),
 				isOpen = this.isExpanded(id);
 			if(rowNode){
-				var nls = this.grid.body._nls;
+				var nls = this.grid.nls;
 				query('.gridxTreeExpandoCell', rowNode).
 					removeClass('gridxTreeExpandoLoading').
 					toggleClass('gridxTreeExpandoCellOpen', isOpen).
@@ -595,7 +593,7 @@ define([
 					expanded = this.isExpanded();
 				rowNode.setAttribute('aria-expanded', expanded);
 				//This is only to make JAWS readk
-				var nls = this.grid.body._nls;
+				var nls = this.grid.nls;
 				query('.gridxTreeExpandoCell', rowNode).closest('.gridxCell').
 					attr('aria-expanded', String(expanded)).
 					attr('aria-label', expanded ? nls.treeExpanded : nls.treeCollapsed);

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

@@ -130,7 +130,7 @@ define([
 					dn[st] = no;
 					finish(true);
 					return d;
-				}else if(no < bs){
+				}else if(no <= bs){
 					dif = no - bs;
 				}else if(no + n.offsetHeight > bs + bn.clientHeight){
 					dif = no + n.offsetHeight - bs - bn.clientHeight;

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

@@ -206,25 +206,31 @@ define([
 				args.visualIndex = t._getVisualIndex(args.parentId, args.rowIndex);
 			}else if(typeof args.visualIndex == 'number' && args.visualIndex >= 0){
 				//Given visual index, get row index and parent id.
-				var rootOpenned = t._openInfo[''].openned,
-					vi = t.rootStart + args.visualIndex;
-				for(var i = 0; i < rootOpenned.length; ++i){
-					var root = t._openInfo[rootOpenned[i]];
-					if(m.idToIndex(root.id) < t.rootStart){
-						vi += root.count;
-					}else{
-						break;
+				var layerId = m.layerId();
+				if(m.isId(layerId)){
+					args.rowIndex = args.visualIndex;
+					args.parentId = layerId;
+				}else{
+					var rootOpenned = t._openInfo[''].openned,
+						vi = t.rootStart + args.visualIndex;
+					for(var i = 0; i < rootOpenned.length; ++i){
+						var root = t._openInfo[rootOpenned[i]];
+						if(m.idToIndex(root.id) < t.rootStart){
+							vi += root.count;
+						}else{
+							break;
+						}
 					}
+					var info = {
+						parentId: '',
+						preCount: 0
+					};
+					while(!info.found){
+						info = t._getChild(vi, info);
+					}
+					args.rowIndex = info.rowIndex;
+					args.parentId = info.parentId;
 				}
-				var info = {
-					parentId: '',
-					preCount: 0
-				};
-				while(!info.found){
-					info = t._getChild(vi, info);
-				}
-				args.rowIndex = info.rowIndex;
-				args.parentId = info.parentId;
 			}else{
 				//Nothing we can do here...
 				return args;
@@ -528,7 +534,8 @@ define([
 					info.count -= count;
 					info = openInfo[info.parentId];
 				}
-				if(parentId === '' && rowIndex >= t.rootStart && rowIndex < t.rootStart + t.rootCount){
+				//sometimes number typed ID can be accidentally changed to string type.
+				if(String(parentId) == String(model.layerId()) && rowIndex >= t.rootStart && rowIndex < t.rootStart + t.rootCount){
 					t.rootCount--;
 				}
 				var rootIndex = model.idToIndex(model.rootId(rowId));

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

@@ -5,7 +5,8 @@ define([
 	"dojo/_base/sniff",
 	"dojo/_base/event",
 	"dojo/_base/Deferred",
-	"dojo/query",
+	// "dojo/query",
+	'gridx/support/query',
 	"dojo/keys",
 	"./VScroller",
 	"../core/_Module"
@@ -101,10 +102,7 @@ define([
 							focus.focusArea('body', 1);	//1 as true
 						}
 						t.lazy = t._lazy;
-						//wait for the dom nodes to settle down.
-						setTimeout(function(){
-							defer.callback(success);
-						}, 5);
+						defer.callback(success);
 					}
 				};
 			if(node){
@@ -199,7 +197,7 @@ define([
 				a = dn.scrollTop,
 				deltaT = a - (t._lastScrollTop || 0),
 				neighborhood = 2;
-	
+			
 			if(forced || deltaT){
 				t._lastScrollTop = a;
 	
@@ -211,7 +209,7 @@ define([
 					visualEnd = visualStart + view.visualCount,
 					bn = t.grid.bodyNode,
 					firstRow = bn.firstChild,
-					firstRowTop = firstRow && firstRow.offsetTop - deltaT,
+					firstRowTop = firstRow && firstRow.clientTop - deltaT,
 					lastRow = bn.lastChild,
 					lastRowBtm = lastRow && lastRow.offsetTop - deltaT + lastRow.offsetHeight,
 					bnTop = bn.scrollTop,
@@ -222,7 +220,8 @@ define([
 					nearTop = a <= neighborhood,
 					nearBottom = Math.abs(a - scrollRange) <= neighborhood,
 					start, end, pos, d;
-				if(bnTop == bnBtm && !bnBtm){
+				//In IE7 offsetTop will be -1 when grid is hidden
+				if((bnTop == bnBtm && !bnBtm) || (lastRow && lastRow.offsetTop < 0)){
 					//The grid is not correctly shown, so we just ignore.
 					return;
 				}
@@ -238,6 +237,17 @@ define([
 					d = Math.ceil((bnBtm - lastRowBtm) * ratio / h) + buffSize;
 					end = nearBottom && a ? visualEnd : Math.min(start + d, visualEnd);
 					pos = "bottom";
+					
+					if(deltaT === 0 && start == visualEnd){
+						//If the last row in the grid has very big height and then change 
+						//to normal or very small height, need to add rows to the front.
+						//this usually appear in DOD, especially GridInGrid mode
+						
+						end = body.renderStart;
+						d = Math.ceil((firstRowTop - bnTop) * ratio / h) + buffSize;
+						start = nearTop ? visualStart : Math.max(end - d, visualStart);
+						pos = "top";
+					}
 				}else if(!firstRow || firstRowTop > bnBtm || !lastRow || lastRowBtm < bnTop){
 					//Replace all
 					if(a <= scrollRange / 2){
@@ -317,7 +327,7 @@ define([
 			t._doScroll(0, 1);
 			//If some scrollToRow requests are pending, resume them.
 			array.forEach(t._scrolls, function(d){
-				if(d.scrollContext){
+				if(d && d.scrollContext){
 					//delete scrollContext to avoid firing multiple times.
 					var scrollContext = d.scrollContext;
 					delete d.scrollContext;
@@ -351,11 +361,13 @@ define([
 			}
 			var dn = t.domNode,
 				//remember the scroll bar position
-				oldScrollTop = dn.scrollTop;
+				oldScrollTop = dn.scrollTop,
+				isBottom = oldScrollTop >= dn.scrollHeight - dn.offsetHeight;
 			t.stubNode.style.height = h + 'px';
 			//Update last scrolltop, to avoid firing _doVirtualScroll with incorrect delta.
 			if(t._lastScrollTop){
-				dn.scrollTop = oldScrollTop;
+				//If we were at bottom, should keep us at bottom after height change.
+				dn.scrollTop = isBottom ? dn.scrollHeight : oldScrollTop;
 				t._lastScrollTop = dn.scrollTop;
 			}
 		},

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

@@ -0,0 +1,351 @@
+define([
+	"dojo/_base/declare",
+	"dojo/_base/lang",
+	"dojo/query",
+	"dojo/_base/array",
+	"dojo/dom-construct",
+	"dojo/dom-geometry",
+	"dojo/dom-class",
+	"dojo/_base/Deferred",
+	"dojo/_base/sniff",
+	"dijit/a11y"
+], function(declare, lang, query, array, domConstruct, domGeo, domClass, Deferred, has, a11y){
+
+/*=====
+	return declare([], {
+		// summary:
+		// description:
+
+		// 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,
+	});
+=====*/
+
+	return declare([], {
+		preload: function(){
+			var t = this,
+				g = t.grid,
+				view = g.view;
+			view.paging = 1;
+			view.rootStart = 0;
+			t._autoPageSize = t.arg('pageSize') == 'auto' || g.pageSize == 'auto';
+			t.pageSize = t.pageSize || t.model._cache.pageSize || 20;
+			view.rootCount = t.pageSize;
+			domClass.remove(t.domNode, 'gridxBodyRowHoverEffect');
+			t.connect(t.domNode, 'onscroll', function(e){
+				g.hScrollerNode.scrollLeft = t.domNode.scrollLeft;
+			});
+
+			if(t.arg('createBottom')){
+				t._bottomNode = domConstruct.create('div', {
+					'class': 'gridxBodyBottom'
+				});
+				t.createBottom(t._bottomNode);
+				t.connect(t._bottomNode, 'onmouseover', function(){
+					query('> .gridxRowOver', t.domNode).removeClass('gridxRowOver');
+				});
+			}
+			if(t.arg('createTop')){
+				t._topNode = domConstruct.create('div', {
+					'class': 'gridxBodyTop'
+				});
+				t.createTop(t._topNode);
+				t.connect(t._topNode, '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);
+			if(t._topNode){
+				focus.registerArea({
+					name: 'bodyTop',
+					priority: 0.9999,
+					focusNode: t._topNode,
+					scope: t,
+					doFocus: lang.partial(doFocus, t._topNode),
+					doBlur: lang.partial(doBlur, t._topNode)
+				});
+			}
+			if(t._bottomNode){
+				focus.registerArea({
+					name: 'bodyBottom',
+					priority: 1.0001,
+					focusNode: t._bottomNode,
+					scope: t,
+					doFocus: lang.partial(doFocus, t._bottomNode),
+					doBlur: lang.partial(doBlur, t._bottomNode)
+				});
+			}
+		},
+
+		load: function(args, startup){
+			var t = this,
+				view = t.grid.view;
+			if(view._err){
+				t._loadFail(view._err);
+			}
+			startup.then(function(){
+				if(t._autoPageSize){
+					var rowCount = parseInt(t.grid.mainNode.offsetHeight / t.arg('defaultRowHeight', 24) * 1.5, 10);
+					t.pageSize = rowCount;
+					view.updateRootRange(0, rowCount);
+				}
+				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 = [];
+						if(n){
+							var rows = t._buildRows(start, count, uncachedRows, renderedRows);
+							if(rows){
+								domConstruct.place(rows, n, 'before');
+							}
+						}
+						while(n && (!t._bottomNode || n !== t._bottomNode)){
+							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', g.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(t._topNode && g.view.rootStart > 0){
+					if(str){
+						n.insertBefore(t._topNode, n.firstChild);
+					}else{
+						n.appendChild(t._topNode);
+					}
+				}
+				if(t._bottomNode && g.view.rootStart + g.view.rootCount < g.model.size()){
+					n.appendChild(t._bottomNode);
+				}
+				n.scrollLeft = g.hScrollerNode.scrollLeft;
+				if(!str){
+					en.style.zIndex = 1;
+				}else{
+					en.innerHTML = '';
+				}
+				if(!t._skipUnrender){
+					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 = '';
+				if(!t._skipUnrender){
+					t.onUnrender();
+				}
+				if(!t.model.size()){
+					en.innerHTML = t.arg('emptyInfo', g.nls.emptyInfo);
+					en.style.zIndex = 1;
+					t.onEmpty();
+					t.model.free();
+				}else{
+					n.appendChild(t._bottomNode);
+				}
+			}
+		},
+
+		onRender: function(/*start, count*/){
+			//FIX #8746
+			var t = this;
+			var bn = t.domNode;
+			query('.gridxBodyFirstRow', bn).removeClass('gridxBodyFirstRow');
+			if(t._topNode){
+				var firstRow = t._topNode.nextSibling;
+				if(firstRow && firstRow != t._bottomNode){
+					domClass.add(firstRow, 'gridxBodyFirstRow');
+				}
+			}
+			query('.gridxBodyLastRow', bn).removeClass('gridxBodyLastRow');
+			if(t._bottomNode){
+				var lastRow = t._bottomNode.previousSibling;
+				if(lastRow && lastRow != t._topNode){
+					domClass.add(lastRow, 'gridxBodyLastRow');
+				}
+			}
+		},
+
+		_load: function(isPost){
+			var t = this,
+				g = t.grid,
+				m = t.model,
+				view = g.view,
+				pageSize = t.arg('pageSize'),
+				btnNode = isPost ? t._bottomNode : t._topNode,
+				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._onLoadFinish(!isPost, renderStart, renderCount, function(){
+						t.onRender(renderStart, renderCount);
+						if(g.indirectSelect){
+							//FIXME: this breaks encapsulation!
+							g.indirectSelect._onSelectionChange();
+						}
+					});
+				};
+			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);
+							if(btnNode){
+								domConstruct.place(str, btnNode, isPost ? 'before' : 'after');
+							}else{
+								domConstruct.place(str, t.domNode, isPost ? 'last' : 'first');
+							}
+							if(!isPost){
+								g.bodyNode.scrollTop += g.bodyNode.scrollHeight - scrollHeight;
+							}
+							if(isPost && btnNode && btnNode.parentNode ? view.rootStart + view.rootCount >= totalCount : view.rootStart === 0){
+								t.domNode.removeChild(btnNode);
+							}
+							array.forEach(renderedRows, t.onAfterRow, t);
+							finish(renderStart, renderCount);
+						});
+					}else{
+						if(isPost && btnNode && btnNode.parentNode && view.rootStart + view.rootCount >= totalCount){
+							t.domNode.removeChild(btnNode);
+						}
+						if(!isPost){
+							query('.gridxBodyFirstRow').removeClass('gridxBodyFirstRow');
+						}
+						finish(renderStart, renderCount);
+					}
+				});
+			});
+		}
+	});
+});

data/app/assets/javascripts/gridx/modules/dnd/Avatar.js

@@ -15,7 +15,7 @@ define([
 =====*/
 
 	return declare(Avatar, {
-		construct: function(manager){
+		construct: function(){
 			var t = this;
 			t.isA11y = domClass.contains(win.body(), "dijit_a11y");