gridx-rails 1.1.0 → 1.2.1

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

@@ -200,6 +200,7 @@ define([
 					cssName: p._cssName,
 					count: p._getDndCount()
 				};
+				t.grid.vScrollerNode.focus();
 				p._onBeginDnd(t._source);
 				dom.setSelectable(t.grid.domNode, false);	
 			}

data/app/assets/javascripts/gridx/modules/extendedSelect/Cell.js

@@ -30,6 +30,7 @@ define([
 
 	return declare(_RowCellBase, {
 		// summary:
+		//		module name: selectCell.
 		//		Provides advanced cell selections.
 		// description:
 		//		This module provides an advanced way for selecting cells by clicking, swiping, SPACE key, or CTRL/SHIFT CLICK to select multiple cell.
@@ -251,7 +252,7 @@ define([
 					if(mouse.isLeft(e) && (
 						!domClass.contains(e.target, 'gridxTreeExpandoIcon') &&
 						!domClass.contains(e.target, 'gridxTreeExpandoInner'))){
-						t._start(createItem(e.rowId, e.visualIndex, e.columnId, e.columnIndex), g._isCopyEvent(e), e.shiftKey);
+						t._start(createItem(e.rowId, e.visualIndex, e.columnId, e.columnIndex), g._isCtrlKey(e), e.shiftKey);
 						if(!e.shiftKey && !t.arg('canSwept')){
 							t._end();
 						}
@@ -263,7 +264,7 @@ define([
 				[g, has('ff') < 4 ? 'onCellKeyUp' : 'onCellKeyDown', function(e){
 					if(e.keyCode === keys.SPACE && (!g.focus || g.focus.currentArea() == 'body')){
 						event.stop(e);
-						t._start(createItem(e.rowId, e.visualIndex, e.columnId, e.columnIndex), g._isCopyEvent(e), e.shiftKey);
+						t._start(createItem(e.rowId, e.visualIndex, e.columnId, e.columnIndex), g._isCtrlKey(e), e.shiftKey);
 						t._end();
 					}
 				}]
@@ -313,7 +314,7 @@ define([
 					g = t.grid,
 					rid = t._getRowId(rowVisIndex),
 					cid = g._columns[colIndex].id;
-				t._start(createItem(rid, rowVisIndex, cid, colIndex), g._isCopyEvent(e), 1);	//1 as true
+				t._start(createItem(rid, rowVisIndex, cid, colIndex), g._isCtrlKey(e), 1);	//1 as true
 				t._end();
 			}
 		},

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

@@ -29,6 +29,7 @@ define([
 
 	return declare(_Base, {
 		// summary:
+		//		module name: selectColumn.
 		//		Provides advanced column selections.
 		// description:
 		//		This module provides an advanced way for selecting columns by clicking, swiping, SPACE key, or CTRL/SHIFT CLICK to select multiple columns.
@@ -192,7 +193,7 @@ define([
 			t.batchConnect(
 				[g, 'onHeaderCellMouseDown', function(e){
 					if(mouse.isLeft(e) && !domClass.contains(e.target, 'gridxArrowButtonNode')){
-						t._start({column: e.columnIndex}, g._isCopyEvent(e), e.shiftKey);
+						t._start({column: e.columnIndex}, g._isCtrlKey(e), e.shiftKey);
 						if(!e.shiftKey && !t.arg('canSwept')){
 							t._end();
 						}
@@ -207,7 +208,7 @@ define([
 				[g, has('ff') < 4 ? 'onHeaderCellKeyUp' : 'onHeaderCellKeyDown', function(e){
 					if((e.keyCode == keys.SPACE || e.keyCode == keys.ENTER) && !domClass.contains(e.target, 'gridxArrowButtonNode')){
 						event.stop(e);
-						t._start({column: e.columnIndex}, g._isCopyEvent(e), e.shiftKey);
+						t._start({column: e.columnIndex}, g._isCtrlKey(e), e.shiftKey);
 						t._end();
 					}
 				}],
@@ -232,7 +233,7 @@ define([
 		_onMoveToHeaderCell: function(columnId, e){
 			if(e.shiftKey && (e.keyCode == keys.LEFT_ARROW || e.keyCode == keys.RIGHT_ARROW)){
 				var t = this, col = t.grid._columnsById[columnId];
-				t._start({column: col.index}, t.grid._isCopyEvent(e), 1);	//1 as true
+				t._start({column: col.index}, t.grid._isCtrlKey(e), 1);	//1 as true
 				t._end();
 			}
 		},
@@ -243,13 +244,11 @@ define([
 		},
 
 		_beginAutoScroll: function(){
-			var autoScroll = this.grid.autoScroll;
-			this._autoScrollV = autoScroll.vertical;
-			autoScroll.vertical = false;
+			this.grid.autoScroll.vertical = false;
 		},
 
 		_endAutoScroll: function(){
-			this.grid.autoScroll.vertical = this._autoScrollV;
+			this.grid.autoScroll.vertical = true;
 		},
 
 		_doHighlight: function(target, toHighlight){

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

@@ -38,6 +38,7 @@ define([
 	
 	return declare(_RowCellBase, {
 		// summary:
+		//		module name: selectRow.
 		//		Provides advanced row selections.
 		// description:
 		//		This module provides an advanced way for selecting rows by clicking, swiping, SPACE key, or CTRL/SHIFT CLICK to select multiple rows.
@@ -235,22 +236,41 @@ define([
 			//Use special types to make filtered out rows unselected
 			t.model._spTypes.select = 1;	//1 as true
 			t.model.setMarkable(lang.hitch(t, t._isSelectable));
+			function canSelect(e){
+				if(e.columnId && t.arg('triggerOnCell')){
+					return g._columnsById[e.columnId].rowSelectable !== false &&
+						!domClass.contains(e.target, 'gridxTreeExpandoIcon') &&
+						!domClass.contains(e.target, 'gridxTreeExpandoInner');
+				}
+				return !e.columnId;
+			}
 			t.batchConnect(
 				g.rowHeader && [g.rowHeader, 'onMoveToRowHeaderCell', '_onMoveToRowHeaderCell'],
 				[g, 'onRowMouseDown', function(e){
-					if(mouse.isLeft(e) && ((t.arg('triggerOnCell') &&
-						!domClass.contains(e.target, 'gridxTreeExpandoIcon') &&
-						!domClass.contains(e.target, 'gridxTreeExpandoInner')) || !e.columnId)){
+					if(mouse.isLeft(e) && canSelect(e)){
 						t._isOnCell = e.columnId;
 						if(t._isOnCell){
 							g.body._focusCellCol = e.columnIndex;
 						}
-						t._start({row: e.visualIndex}, g._isCopyEvent(e), e.shiftKey);
+						t._start({row: e.visualIndex}, g._isCtrlKey(e), e.shiftKey);
 						if(!e.shiftKey && !t.arg('canSwept')){
 							t._end();
 						}
 					}
 				}],
+				[g, 'onRowTouchStart', function(e){
+					if(canSelect(e)){
+						t._isOnCell = e.columnId;
+						if(t._isOnCell){
+							g.body._focusCellCol = e.columnIndex;
+						}
+						t._start({row: e.visualIndex}, g._isCtrlKey(e) || e.columnId === '__indirectSelect__', e.shiftKey);
+						if(!e.shiftKey && !t.arg('canSwept')){
+							t._end();
+						}
+					}
+				}],
+				[g, 'onRowTouchEnd', '_end'],
 				[g.body, 'onAfterRow', function(row){
 					var unselectable = !row.isSelectable();
 					domClass.toggle(row.node(), 'gridxRowUnselectable', unselectable);
@@ -268,11 +288,11 @@ define([
 							(t.arg('triggerOnCell') && (!g.focus || g.focus.currentArea() == 'body')))){
 						event.stop(e);
 						t._isOnCell = e.columnId;
-						t._start({row: e.visualIndex}, g._isCopyEvent(e), e.shiftKey);
+						t._start({row: e.visualIndex}, g._isCtrlKey(e), e.shiftKey);
 						t._end();
 					}
 				}],
-				[g, 'setStore', '_syncMarkable']);
+				[g.model, 'setStore', '_syncUnselectable']);
 		},
 
 		_markById: function(args, toSelect){
@@ -343,14 +363,14 @@ define([
 		_onMoveToCell: function(rowVisIndex, colIndex, e){
 			var t = this;
 			if(t.arg('triggerOnCell') && e.shiftKey && (e.keyCode == keys.UP_ARROW || e.keyCode == keys.DOWN_ARROW)){
-				t._start({row: rowVisIndex}, t.grid._isCopyEvent(e), 1);	//1 as true
+				t._start({row: rowVisIndex}, t.grid._isCtrlKey(e), 1);	//1 as true
 				t._end();
 			}
 		},
 
 		_onMoveToRowHeaderCell: function(rowVisIndex, e){
 			if(e.shiftKey){
-				this._start({row: rowVisIndex}, this.grid._isCopyEvent(e), 1);	//1 as true
+				this._start({row: rowVisIndex}, this.grid._isCtrlKey(e), 1);	//1 as true
 				this._end();
 			}
 		},
@@ -362,13 +382,11 @@ define([
 		},
 
 		_beginAutoScroll: function(){
-			var autoScroll = this.grid.autoScroll;
-			this._autoScrollH = autoScroll.horizontal;
-			autoScroll.horizontal = false;
+			this.grid.autoScroll.horizontal = false;
 		},
 
 		_endAutoScroll: function(){
-			this.grid.autoScroll.horizontal = this._autoScrollH;
+			this.grid.autoScroll.horizontal = true;
 		},
 
 		_doHighlight: function(target, toHighlight){
@@ -447,12 +465,12 @@ define([
 			this._doHighlight(target, toHighlight);
 		},
 		
-		_syncMarkable: function(){
+		_syncUnselectable: function(){
 			var t = this,
-				unselectable = this.arg('unselectable');
+				unselectable = t.arg('unselectable');
 			for(var id in unselectable){
 				t.model.setMarkable(id, !unselectable[id]);
-			}	
+			}
 		}
 	});
 });

data/app/assets/javascripts/gridx/modules/filter/FilterBar.js

@@ -28,6 +28,7 @@ define([
 /*=====
 	var FilterBar = declare(_Module, {
 		// summary:
+		//		module name: filterBar.
 		//		Filter bar module.
 		// description:
 		//		Show a filter bar on top of grid header. Clicking the filter bar will show a filter dialog to config conditions.
@@ -219,6 +220,10 @@ define([
 			this.connect(this.domNode, 'onmouseover', 'onDomMouseOver');
 			this.connect(this.domNode, 'onmousemove', 'onDomMouseMove');
 			this.connect(this.domNode, 'onmouseout', 'onDomMouseOut');
+			this.aspect(this.grid.model, 'setStore', function(){
+				this.filterData = null;
+				this._buildFilterState();
+			});
 			this.loaded.callback();
 		},
 		onDomClick: function(e){
@@ -269,7 +274,7 @@ define([
 			this.grid.filter.setFilter(filter);
 			this.model.when({}).then(function(){
 				_this._currentSize = _this.model.size();
-				_this._totalSize = _this.model._cache.size();
+				_this._totalSize = _this.model._cache.totalSize >= 0 ? _this.model._cache.totalSize : _this.model._cache.size();
 				_this._buildFilterState();
 			});
 		},
@@ -336,12 +341,9 @@ define([
 		refresh: function(){
 			this.btnClose.style.display = this.closeButton ? '': 'none';
 			this.btnFilter.domNode.style.display = this.arg('defineFilterButton') ? '': 'none';
-			var _this = this;
-			this.model.when({}).then(function(){
-				_this._currentSize = _this.model.size();
-				_this._totalSize = _this.model._cache.size();
-				_this._buildFilterState();
-			});
+			this._currentSize = this.model.size();
+			this._totalSize = this.model._cache.totalSize >= 0 ? this.model._cache.totalSize : this.model._cache.size();
+			this._buildFilterState();
 		},
 		isVisible: function(){
 			return this.domNode.style.display != 'none';

data/app/assets/javascripts/gridx/modules/filter/FilterDialog.js

@@ -114,7 +114,7 @@ define([
 			}catch(e){}
 			css.toggle(ac.domNode, 'gridxFilterSingleRule', ac.getChildren().length === 1);
 			
-			fp.connect(fp, 'onChange', lang.hitch(this, '_updateButtons'));
+			this.connect(fp, 'onChange', '_updateButtons');
 			this._updateButtons();
 			this._updateAccordionContainerHeight();
 			//scroll to bottom when add a rule

data/app/assets/javascripts/gridx/modules/filter/FilterPane.js

@@ -277,7 +277,7 @@ define([
 				case 'Text':
 					return (combo ? this.comboText : this.tbSingle).get('value') || null;
 				case 'Number':
-					return isNaN(this.tbNumber.get('value')) ? null : this.tbNumber.get('value');
+					return (isNaN(this.tbNumber.get('value')) || !this.tbNumber.isValid())? null : this.tbNumber.get('value');
 				case 'Select':
 					return this.sltSingle.get('value') || null;
 				case 'Date':

data/app/assets/javascripts/gridx/modules/filter/QuickFilter.js

@@ -8,6 +8,7 @@ define([
 /*=====
 	return declare(_Module, {
 		// summary:
+		//		module name: quickFilter.
 		//		Directly show gridx/support/QuickFilter in gridx/modules/Bar at the top/right position.
 		// description:
 		//		This module is only for convenience. For other positions or more configurations, please use gridx/modules/Bar directly.

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

@@ -17,6 +17,7 @@ define([
 
 	return declare(_Module, {
 		// summary:
+		//		module name: moveColumn.
 		//		This module provides several APIs to move columns within grid.
 		// description:
 		//		This module does not include any UI. So different kind of column dnd UI implementations can be built
@@ -193,7 +194,7 @@ define([
 				ltr = g.isLeftToRight(),
 				preKey = ltr ? keys.LEFT_ARROW : keys.RIGHT_ARROW,
 				postKey = ltr ? keys.RIGHT_ARROW : keys.LEFT_ARROW;
-			if(e.ctrlKey && !e.shiftKey && !e.altKey && (e.keyCode == preKey || e.keyCode == postKey)){
+			if(g._isCtrlKey(e) && !e.shiftKey && !e.altKey && (e.keyCode == preKey || e.keyCode == postKey)){
 				var target = e.columnIndex,
 					colIdxes = selector && selector.isSelected(e.columnId) ?
 						array.map(selector.getSelected(), function(id){

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

@@ -13,6 +13,7 @@ define([
 
 	return declare(_Module, {
 		// summary:
+		//		module name: moveRow.
 		//		This module provides some APIs to move rows within grid
 		// description:
 		//		This module requires the "Move" model extension.
@@ -118,7 +119,7 @@ define([
 			var t = this,
 				g = t.grid,
 				selector = g.select && g.select.row;
-			if(e.ctrlKey && !e.shiftKey && !e.altKey && (e.keyCode == keys.UP_ARROW || e.keyCode == keys.DOWN_ARROW)){
+			if(g._isCtrlKey(e) && !e.shiftKey && !e.altKey && (e.keyCode == keys.UP_ARROW || e.keyCode == keys.DOWN_ARROW)){
 				var target = e.rowIndex,
 					doMove = function(rowIdxes){
 						if(e.keyCode == keys.UP_ARROW){

data/app/assets/javascripts/gridx/modules/pagination/PaginationBar.js

@@ -10,6 +10,7 @@ define([
 /*=====
 	return declare(_PaginationBarBase, {
 		// summary:
+		//		module name: paginationBar.
 		//		Show link button pagination bar at the bottom of grid.
 		// description:
 		//		This module directly uses gridx/modules/Bar to show gridx/support/Summary, gridx/support/LinkPager, gridx/support/LinkSizer,

data/app/assets/javascripts/gridx/modules/pagination/PaginationBarDD.js

@@ -8,6 +8,8 @@ define([
 
 /*=====
 	return declare(_PaginationBarBase, {
+		// summary:
+		//		module name: paginationBar.
 	});
 =====*/
 

data/app/assets/javascripts/gridx/modules/select/Cell.js

@@ -26,6 +26,7 @@ define([
 
 	return declare(_RowCellBase, {
 		// summary:
+		//		module name: selectCell.
 		//		Provides simple cell selection.
 		// description:
 		//		This module provides a simple way for selecting cells by clicking or SPACE key, or CTRL + Click to select multiple cells.
@@ -163,16 +164,18 @@ define([
 			var t = this,
 				g = t.grid;
 			t.inherited(arguments);
+			var doSelect = function(e){
+				if(!domClass.contains(e.target, 'gridxTreeExpandoIcon') &&
+					!domClass.contains(e.target, 'gridxTreeExpandoInner')){
+					t._select([e.rowId, e.columnId], g._isCtrlKey(e));
+				}
+			};
 			t.batchConnect(
-				[g, 'onCellClick', function(e){
-					if(!domClass.contains(e.target, 'gridxTreeExpandoIcon') &&
-						!domClass.contains(e.target, 'gridxTreeExpandoInner')){
-						t._select([e.rowId, e.columnId], g._isCopyEvent(e));
-					}
-				}],
+				[g, 'onCellClick', doSelect],
+				[g, 'onCellTouchStart', doSelect],
 				[g, has('ff') < 4 ? 'onCellKeyUp' : 'onCellKeyDown', function(e){
 					if(e.keyCode == keys.SPACE && (!g.focus || g.focus.currentArea() == 'body')){
-						t._select([e.rowId, e.columnId], g._isCopyEvent(e));
+						t._select([e.rowId, e.columnId], g._isCtrlKey(e));
 						event.stop(e);
 					}
 				}]);

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

@@ -27,6 +27,7 @@ define([
 
 	return declare(_Base, {
 		// summary:
+		//		module name: selectColumn.
 		//		Provides simple column selection.
 		// description:
 		//		This module provides a simple way for selecting columns by clicking or SPACE key, 
@@ -157,12 +158,12 @@ define([
 			t.batchConnect(
 				[g, 'onHeaderCellClick', function(e){
 					if(!domClass.contains(e.target, 'gridxArrowButtonNode')){
-						t._select(e.columnId, g._isCopyEvent(e));
+						t._select(e.columnId, g._isCtrlKey(e));
 					}
 				}],
 				[g, has('ff') < 4 ? 'onHeaderCellKeyUp' : 'onHeaderCellKeyDown', function(e){
 					if(e.keyCode == keys.SPACE || e.keyCode == keys.ENTER){
-						t._select(e.columnId, g._isCopyEvent(e));
+						t._select(e.columnId, g._isCtrlKey(e));
 						event.stop(e);
 					}
 				}]

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

@@ -36,6 +36,7 @@ define([
 
 	return declare(_RowCellBase, {
 		// summary:
+		//		module name: selectRow.
 		//		Provides simple row selection.
 		// description:
 		//		This module provides a simple way for selecting rows by clicking or SPACE key, or CTRL + Click to select multiple rows.
@@ -215,14 +216,24 @@ define([
 			t.inherited(arguments);
 			t.model._spTypes.select = 1;
 			t.model.setMarkable(lang.hitch(t, '_isSelectable'));
+			function canSelect(e){
+				if(e.columnId && t.arg('triggerOnCell')){
+					return g._columnsById[e.columnId].rowSelectable !== false &&
+						!domClass.contains(e.target, 'gridxTreeExpandoIcon') &&
+						!domClass.contains(e.target, 'gridxTreeExpandoInner');
+				}
+				return !e.columnId;
+			}
 			t.batchConnect(
-				[g, 'onRowClick', function(e){
+				[g, 'onRowMouseDown', function(e){
 					//Have to check whether we are on the 
-					if((t.arg('triggerOnCell') &&
-						!domClass.contains(e.target, 'gridxTreeExpandoIcon') &&
-						!domClass.contains(e.target, 'gridxTreeExpandoInner')) ||
-						!e.columnId){
-						t._select(e.rowId, g._isCopyEvent(e));
+					if(canSelect(e)){
+						t._select(e.rowId, g._isCtrlKey(e));
+					}
+				}],
+				[g, 'onRowTouchStart', function(e){
+					if(canSelect(e)){
+						t._select(e.rowId, g._isCtrlKey(e) || e.columnId === '__indirectSelect__');
 					}
 				}],
 				[g.body, 'onAfterRow', function(row){
@@ -230,15 +241,18 @@ define([
 					domClass.toggle(row.node(), 'gridxRowUnselectable', unselectable);
 				}],
 				[g, has('ff') < 4 ? 'onRowKeyUp' : 'onRowKeyDown', function(e){
-					if((t.arg('triggerOnCell') || !e.columnId) && e.keyCode == keys.SPACE){
+					if(e.keyCode == keys.SPACE && (!e.columnId ||
+							(g._columnsById[e.columnId].rowSelectable) ||
+							//When trigger on cell, check if we are navigating on body, reducing the odds of conflictions.
+							(t.arg('triggerOnCell') && (!g.focus || g.focus.currentArea() == 'body')))){
 						var cell = g.cell(e.rowId, e.columnId);
 						if(!(cell && cell.isEditing && cell.isEditing())){
-							t._select(e.rowId, g._isCopyEvent(e));
+							t._select(e.rowId, g._isCtrlKey(e));
 							event.stop(e);
 						}
 					}
 				}],
-				[g, 'setStore', '_syncMarkable']
+				[g.model, 'setStore', '_syncUnselectable']
 				);
 		},
 
@@ -290,13 +304,13 @@ define([
 				}
 			}
 		},
-	
-		_syncMarkable: function(){
+		
+		_syncUnselectable: function(){
 			var t = this,
-				unselectable = this.arg('unselectable');
+				unselectable = t.arg('unselectable');
 			for(var id in unselectable){
 				t.model.setMarkable(id, !unselectable[id]);
-			}	
+			}
 		}
 	});
 });