gridx-rails 1.1.0 → 1.2.1

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

@@ -7,6 +7,7 @@ define([
 /*=====
 	return declare(_Module, {
 		// summary:
+		//		module name: pagination.
 		//		This module provides (logical) pagination functionality for grid.
 		// description:
 		//		This module does not include any UI buttons for pagination, so that various

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

@@ -11,6 +11,7 @@ define([
 /*=====
 	return declare(_Module, {
 		// summary:
+		//		module name: persist.
 		//		Provide a mechanism to persist various grid features when the grid is destroyed,
 		//		so that when a new grid with the same id (or the same persist key) is created,
 		//		all these features will be restored.

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

@@ -15,6 +15,7 @@ define([
 /*=====
 	return declare(_Module, {
 		// summary:
+		//		module name: rowHeader.
 		//		This modules provides a header before each row.
 		// description:
 		//		Row header can be used as a UI handler for row selection, especially when
@@ -151,15 +152,14 @@ define([
 				visualIndex = row.visualIndex(),
 				n = query('[visualindex="' + visualIndex + '"].gridxRowHeaderRow', t.bodyNode)[0],
 				bn = t.grid.dod? query('[visualindex="' + visualIndex + '"].gridxRow', t.grid.bodyNode)[0] : query('[visualindex="' + visualIndex + '"].gridxRow .gridxRowTable', t.grid.bodyNode)[0],
-				nt = n.firstChild,
 				cp = t.arg('cellProvider');
 			n.setAttribute('rowid', row.id);
 			n.setAttribute('rowindex', row.index());
 			n.setAttribute('parentid', t.model.treePath(row.id).pop() || '');
 			if(cp){
-				nt.firstChild.firstChild.firstChild.innerHTML = cp.call(t, row);
+				n.firstChild.firstChild.firstChild.firstChild.innerHTML = cp.call(t, row);
 			}
-			t._syncRowHeight(nt, bn);
+			t._syncRowHeight(n, bn);
 		},
 
 		_onAfterCell: function(cell){
@@ -168,7 +168,7 @@ define([
 				visualIndex = cell.row.visualIndex(),
 				n = query('[visualindex="' + visualIndex + '"].gridxRowHeaderRow', t.bodyNode)[0],
 				bn = query('[visualindex="' + visualIndex + '"].gridxRow .gridxRowTable', t.grid.bodyNode)[0];
-			t._syncRowHeight(n.firstChild, bn);
+			t._syncRowHeight(n, bn);
 		},
 
 		_syncRowHeight: function(rowHeaderNode, bodyNode){
@@ -183,9 +183,11 @@ define([
 			function getHeight(){
 				return has('ie') <= 8 || t._isCollapse ? bodyNode.offsetHeight + 'px' : domStyle.getComputedStyle(bodyNode).height;
 			}
-			rowHeaderNode.style.height = getHeight();
+			rowHeaderNode.style.height = rowHeaderNode.firstChild.style.height = getHeight();
 			setTimeout(function(){
-				rowHeaderNode.style.height = getHeight();
+				if(rowHeaderNode && rowHeaderNode.firstChild){
+					rowHeaderNode.style.height = rowHeaderNode.firstChild.style.height = getHeight();
+				}
 			}, 0);
 		},
 
@@ -251,10 +253,9 @@ define([
 			for(var brn = this.grid.bodyNode.firstChild, n = this.bodyNode.firstChild;
 				brn && n;
 				brn = brn.nextSibling, n = n.nextSibling){
-					var bn = this.grid.dod? brn : brn.firstChild;
-					n.firstChild.style.height = ie > 8? domStyle.getComputedStyle(bn).height : bn.offsetHeight + 'px';
-					
-					// n.firstChild.style.height = ie > 8? domStyle.getComputedStyle(brn.firstChild).height : brn.firstChild.offsetHeight + 'px';
+					var bn = this.grid.dod ? brn : brn.firstChild;
+					var h = ie > 8 ? domStyle.getComputedStyle(bn).height : bn.offsetHeight + 'px';
+					n.style.height = n.firstChild.style.height = h;
 			}
 			var t = this,
 				g = t.grid,

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

@@ -36,6 +36,7 @@ define([
 
 	var SingleSort = declare(_Module, {
 		// summary:
+		//		module name: sort.
 		//		This module provides the single column sorting functionality for grid.
 
 		// initialOrder: Object|Array

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

@@ -8,6 +8,7 @@ define([
 /*=====
 	return declare(_Module, {
 		// summary:
+		//		module name: summaryBar.
 		//		Add summary bar to the bottom of grid.
 		// description:
 		//		Add summary based on Bar module. This module is only for conveniency and backward compatibility.

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

@@ -9,15 +9,18 @@ define([
 /*=====
 	return declare(_Module, {
 		// summary:
+		//		module name: toolBar.
 		//		Add toolbar on top of grid.
 		// description:
 		//		Add toolbar based on Bar module. This module is only for conveniency and backward compatibility.
 		//		Using Bar module directly is recommended.
 
 		// widget: [readonly] Object
+		//		
 		widget: null,
 
 		// domNode: [readonly] HTMLElement
+		//		
 		domNode: null
 	});
 =====*/

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

@@ -11,6 +11,7 @@ define([
 /*=====
 	return declare(_Module, {
 		// summary:
+		//		module name: touchScroll.
 		//		Make desktop grid scrollable by touch in mobile devices.
 		// description:
 		//		No bouncing and sliding effect now.

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

@@ -13,6 +13,7 @@ define([
 /*=====
 	return declare(VScroller, {
 		// summary:
+		//		module name: vScroller.
 		//		A vertical scroller only for touch devices.
 		// description:
 		//		Using dojox/mobile/scrollable, and no lazy-rendering (all rows are rendered out).
@@ -20,8 +21,15 @@ define([
 =====*/
 
 	return declare(VScroller, {
+		constructor: function(){
+			if(has('ios') || has('android') || this.arg('touch')){
+				domClass.add(this.grid.domNode, 'gridxTouchVScroller');
+				this.domNode.style.width = '';
+			}
+		},
+
 		scrollToRow: function(rowVisualIndex, toTop){
-			if(has('ios') || has('android')){
+			if(has('ios') || has('android') || this.arg('touch')){
 				var d = new Deferred(),
 					rowNode = query('[visualindex="' + rowVisualIndex + '"]', this.grid.bodyNode)[0];
 				if(rowNode){
@@ -34,8 +42,24 @@ define([
 			return this.inherited(arguments);
 		},
 
+		scroll: function(top){
+			if(has('ios') || has('android') || this.arg('touch')){
+				this._scrollable.scrollTo({ y: top });
+			}else{
+				this.inherited(arguments);
+			}
+		},
+
+		position: function(){
+			if(has('ios') || has('android') || this.arg('touch')){
+				return this._scrollable.getPos().y;
+			}else{
+				return this.inherited(arguments);
+			}
+		},
+
 		_init: function(){
-			if(has('ios') || has('android')){
+			if(has('ios') || has('android') || this.arg('touch')){
 				var t = this,
 					g = t.grid,
 					view = g.view,
@@ -44,7 +68,6 @@ define([
 					bodyNode = g.bodyNode,
 					headerTable = h.firstChild,
 					scrollable = t._scrollable = new Scrollable();
-				domClass.add(g.domNode, 'gridxTouchVScroller');
 				h.style.height = headerTable.offsetHeight + 'px';
 				scrollable.init({
 					domNode: mainNode,
@@ -69,12 +92,12 @@ define([
 				});
 				t.aspect(g.hScroller, 'refresh', function(){
 					scrollable._h = bodyNode.scrollWidth > mainNode.clientWidth;
-					scrollable._v = bodyNode.scrollHeight > mainNode.clientHeight;
+//                    scrollable._v = bodyNode.scrollHeight > mainNode.clientHeight;
 				});
 				t._onBodyChange = function(){
 					t._update();
 				};
-				t._onForcedScroll = function(){};
+//                t._onForcedScroll = function(){};
 				t.model.when({
 					start: view.rootStart,
 					count: view.rootCount

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

@@ -82,6 +82,7 @@ define([
 
 	return declare(_Module, {
 		// summary:
+		//		module name: traverse.
 		//		Provides some useful functions to traverse among rows/columns/cells.
 	});
 =====*/

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

@@ -55,6 +55,7 @@ define([
 
 	var Tree = declare(_Module, {
 		// summary:
+		//		module name: tree.
 		//		This module manages row expansion/collapsing in tree grid.
 		// description:
 		//		To use tree grid, the store must have 2 extra methods: hasChildren and getChildren.
@@ -633,7 +634,7 @@ define([
 						});
 					});
 				}
-			}else if(e.ctrlKey && isExpando(e.cellNode)){
+			}else if(t.grid._isCtrlKey(e) && isExpando(e.cellNode)){
 				var ltr = t.grid.isLeftToRight();
 				if(e.keyCode == (ltr ? keys.LEFT_ARROW : keys.RIGHT_ARROW) && t.isExpanded(e.rowId)){
 					t.collapse(e.rowId);

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

@@ -7,6 +7,7 @@ define([
 /*=====
 	return declare(_Module, {
 		// summary:
+		//		module name: vLayout.
 		//		This module manages the vertical layout of all the grid UI parts.
 		// description:
 		//		When user creates a grid with a given height, it means the height of the whole grid,

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

@@ -15,6 +15,7 @@ define([
 /*=====
 	return declare(_Module, {
 		// summary:
+		//		module name: vScroller.
 		//		This module provides basic vertical scrolling logic for grid.
 		// description:
 		//		This module will make the grid body render all rows without paging.
@@ -57,7 +58,7 @@ define([
 				if(has('ie') < 8){
 					dn.style.width = '0px';
 				}
-			}else{
+			}else if(!has('mac')){
 				var w = metrics.getScrollbar().w,
 					ltr = g.isLeftToRight();
 				dn.style.width = w + 'px';
@@ -65,8 +66,7 @@ define([
 				if(has('ie') < 8){
 					t.stubNode.style.width = (w + 1) + 'px';
 				}
-			}
-			if(has('mac')){
+			}else{
 				domClass.add(g.domNode, 'gridxMac');
 			}
 		},
@@ -143,6 +143,14 @@ define([
 			finish(!!n);
 			return d;
 		},
+
+		scroll: function(top){
+			this.domNode.scrollTop = top;
+		},
+
+		position: function(){
+			return this.domNode.scrollTop;
+		},
 	
 		//Protected -------------------------------------------------
 		_init: function(){
@@ -173,11 +181,10 @@ define([
 				}else{
 					ds.width = '';
 				}
-				var display = toShow ? '' : 'none';
-				var changed = display != domStyle.get(t.domNode, 'display');
+				var display = toShow ? 'block' : 'none';
+				var changed = display != (domStyle.get(t.domNode, 'display') || 'block');
 				ds.display = display;
-				if(changed){
-					t._updatePos();
+				if(t._updatePos() || changed){
 					g.hLayout.reLayout();
 				}
 			}
@@ -188,8 +195,11 @@ define([
 				dn = this.domNode,
 				ds = dn.style,
 				ltr = g.isLeftToRight(),
-				mainBorder = domGeo.getBorderExtents(g.mainNode);
-			ds[ltr ? 'right' : 'left'] = -(dn.offsetWidth + (ltr ? mainBorder.r : mainBorder.l)) + 'px';
+				mainBorder = domGeo.getBorderExtents(g.mainNode),
+				attr = ltr ? 'right' : 'left';
+				oldValue = ds[attr];
+			ds[attr] = -(dn.offsetWidth + (ltr ? mainBorder.r : mainBorder.l)) + 'px';
+			return oldValue != ds[attr];
 		},
 
 		_doScroll: function(){
@@ -240,13 +250,14 @@ define([
 				bn = g.bodyNode,
 				focus = g.focus,
 				sn = t.domNode,
+				ctrlKey = g._isCtrlKey(evt),
 				rowNode;
 			if(bn.childNodes.length && (!focus || focus.currentArea() == 'body')){
-				if(evt.keyCode == keys.HOME && evt.ctrlKey){
+				if(evt.keyCode == keys.HOME && ctrlKey){
 					sn[st] = 0;
 					rowNode = bn.firstChild;
 					bd._focusCellCol = 0;
-				}else if(evt.keyCode == keys.END && evt.ctrlKey){
+				}else if(evt.keyCode == keys.END && ctrlKey){
 					sn[st] = sn.scrollHeight - sn.offsetHeight;
 					rowNode = bn.lastChild;
 					bd._focusCellCol = g._columns.length - 1;

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

@@ -18,6 +18,7 @@ define([
 
 	var View = declare(_Module, {
 		// summary:
+		//		module name: view.
 		//		Manages how many and what rows should be shown in the current grid body.
 		// description:
 		//		This module defines a key concept: visual index, which is the position of a row in current grid body.
@@ -150,7 +151,7 @@ define([
 			t._clear();
 			t.aspect(m, 'onSizeChange', '_onSizeChange');
 			t.aspect(m, 'onDelete', '_onDelete');
-			t.aspect(g, 'setStore', function(){
+			t.aspect(m, 'setStore', function(){
 				//If server store changes without notifying grid, expanded rows should remain expanded.
 				if(t.arg('clearOnSetStore')){
 					t._clear();
@@ -458,9 +459,7 @@ define([
 					});
 				}
 			};
-			m.when({}, function(){
-				fetchLevel(0);
-			});
+			fetchLevel(0);
 			return d;
 		},
 
@@ -529,12 +528,18 @@ define([
 					info.count -= count;
 					info = openInfo[info.parentId];
 				}
-				t.visualCount -= count;
+				if(parentId === '' && rowIndex >= t.rootStart && rowIndex < t.rootStart + t.rootCount){
+					t.rootCount--;
+				}
+				var rootIndex = model.idToIndex(model.rootId(rowId));
+				if(rootIndex >= t.rootStart && rootIndex < t.rootStart + t.rootCount){
+					t.visualCount -= count;
+				}
 			}else{
 				//FIXME: what to do if some unknown row is deleted?
 				this._clear();
-				this.grid.body.lazyRefresh();
 			}
+			this.grid.body.lazyRefresh();
 		}
 	});
 });

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

@@ -14,6 +14,7 @@ define([
 /*=====
 	return declare(VScroller, {
 		// summary:
+		//		module name: vScroller.
 		//		This module implements lazy-rendering when virtically scrolling grid.
 		// description:
 		//		This module takes a DOMNode-based way to implement lazy-rendering.
@@ -183,6 +184,7 @@ define([
 	
 		_init: function(args){
 			var t = this;
+			t._avgRowHeight = t.grid.body.arg('defaultRowHeight') || 24;
 			t._rowHeight = {};
 			t._syncHeight();
 			t.connect(t.grid, '_onResizeEnd', function(){
@@ -349,11 +351,12 @@ define([
 			}
 			var dn = t.domNode,
 				//remember the scroll bar position
-				r = dn.scrollTop / dn.scrollHeight;
+				oldScrollTop = dn.scrollTop;
 			t.stubNode.style.height = h + 'px';
 			//Update last scrolltop, to avoid firing _doVirtualScroll with incorrect delta.
 			if(t._lastScrollTop){
-				t._lastScrollTop = dn.scrollTop = dn.scrollHeight * r;
+				dn.scrollTop = oldScrollTop;
+				t._lastScrollTop = dn.scrollTop;
 			}
 		},
 	
@@ -415,16 +418,17 @@ define([
 				view = t.grid.view,
 				focus = t.grid.focus,
 				sn = t.domNode,
+				ctrlKey = t.grid._isCtrlKey(evt),
 				st = 'scrollTop',
 				r,
 				fc = '_focusCellRow';
 			if(!focus || focus.currentArea() == 'body'){
-				if(evt.keyCode == keys.HOME && evt.ctrlKey){
+				if(evt.keyCode == keys.HOME && ctrlKey){
 					bd._focusCellCol = 0;
 					bd[fc] = 0;
 					sn[st] = 0;
 					bd._focusCell();
-				}else if(evt.keyCode == keys.END && evt.ctrlKey){
+				}else if(evt.keyCode == keys.END && ctrlKey){
 					bd._focusCellCol = t.grid._columns.length - 1;
 					bd[fc] = view.visualCount - 1;
 					sn[st] = t.stubNode.clientHeight - bd.domNode.offsetHeight;

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

@@ -11,6 +11,7 @@ define([
 /*=====
 	return declare(_Base, {
 		// summary:
+		//		module name: dndColumn.
 		//		This module provides an implementation of column drag & drop.
 		// description:
 		//		This module supports column reordering within grid, dragging out of grid, and dragging into grid.
@@ -104,13 +105,11 @@ define([
 		},
 	
 		_onBeginAutoScroll: function(){
-			var autoScroll = this.grid.autoScroll;
-			this._autoScrollV = autoScroll.vertical;
-			autoScroll.vertical = false;
+			this.grid.autoScroll.vertical = false;
 		},
 
 		_onEndAutoScroll: function(){
-			this.grid.autoScroll.vertical = this._autoScrollV;
+			this.grid.autoScroll.vertical = true;
 		},
 
 		_getItemData: function(id){

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

@@ -13,6 +13,7 @@ define([
 /*=====
 	return declare(_Base, {
 		// summary:
+		//		module name: dndRow.
 		//		This module provides an implementation of row drag & drop.
 		// description:
 		//		This module supports row reordering within grid, dragging out of grid, and dragging into grid.
@@ -140,13 +141,11 @@ define([
 		},
 
 		_onBeginAutoScroll: function(){
-			var autoScroll = this.grid.autoScroll;
-			this._autoScrollH = autoScroll.horizontal;
-			autoScroll.horizontal = false;
+			this.grid.autoScroll.horizontal = false;
 		},
 
 		_onEndAutoScroll: function(){
-			this.grid.autoScroll.horizontal = this._autoScrollH;
+			this.grid.autoScroll.horizontal = true;
 		},
 
 		_getItemData: function(id){