gridx-rails 1.1.0 → 1.2.1

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

@@ -11,6 +11,7 @@ define([
 /*=====
 	var Filter = declare(_Module, {
 		// summary:
+		//		module name: filter.
 		//		This module makes it possible for user to set arbitrary filter condition to grid.
 
 		serverMode: false,
@@ -53,7 +54,7 @@ define([
 		}
 	});
 
-	Filter.__FilterExpressionTools = {
+	Filter.__FilterExpressionTools = declare([], {
 		// summary:
 		//		A filter expression is just a function returning TRUE/FALSE.
 		//		Here provides a set of useful expression tools to help construct complicated filter expressions for grid.
@@ -243,7 +244,7 @@ define([
 			// return: Function
 			//		A filter expression.
 		}
-	};
+	});
 
 	return Filter;
 =====*/
@@ -256,6 +257,9 @@ define([
 
 		constructor: function(){
 			this.setFilter(this.arg('preCondition'), 1);
+			this.aspect(this.grid.model, 'setStore', function(){
+				this._checker = null;
+			});
 		},
 
 		serverMode: false,
@@ -324,7 +328,7 @@ define([
 				d.setFullYear(2000);
 				return d.getTime();
 			default: //string
-				return d === null || d === undefined ? '' : String(d);
+				return (d === null || d === undefined) ? '' : String(d);
 		}
 	}
 

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

@@ -13,6 +13,7 @@ define([
 /*=====
 	var Focus = declare(_Module, {
 		// summary
+		//		module name: focus.
 		//		This module controls the TAB sequence of all the UI modules.
 		//		But this module is (or at least can be) a non-UI module, because it does not handle the actual focus job.
 
@@ -162,7 +163,9 @@ define([
 
 	return declare(_Module, {
 		name: 'focus',
-		
+
+		enabled: !has('ios') && !has('android'),
+
 		constructor: function(){
 			var t = this,
 				g = t.grid;
@@ -360,7 +363,7 @@ define([
 		_stackIdx: 0,
 
 		_onTabDown: function(evt){
-			if(evt.keyCode === keys.TAB){
+			if(this.arg('enabled') && evt.keyCode === keys.TAB){
 				this.tab(evt.shiftKey ? -1 : 1, evt);
 			}
 		},
@@ -371,54 +374,60 @@ define([
 				dn = t.grid.domNode,
 				n = evt.target,
 				currentArea = t._areas[t.currentArea()];
-			while(n && n !== dn){
-				i = array.indexOf(t._focusNodes, n);
-				if(i >= 0){
-					stack = t._tabQueue[i].stack;
-					for(j = 0; j < stack.length; ++j){
-						area = t._areas[stack[j]];
-						if(area.onFocus(evt)){
-							if(currentArea && currentArea.name !== area.name){
-								currentArea.onBlur(evt);
-								t.onBlurArea(currentArea.name);
+			if(t.arg('enabled')){
+				while(n && n !== dn){
+					i = array.indexOf(t._focusNodes, n);
+					if(i >= 0){
+						stack = t._tabQueue[i].stack;
+						for(j = 0; j < stack.length; ++j){
+							area = t._areas[stack[j]];
+							if(area.onFocus(evt)){
+								if(currentArea && currentArea.name !== area.name){
+									currentArea.onBlur(evt);
+									t.onBlurArea(currentArea.name);
+								}
+								t.onFocusArea(area.name);
+								t._queueIdx = i;
+								t._stackIdx = j;
+								return;
 							}
-							t.onFocusArea(area.name);
-							t._queueIdx = i;
-							t._stackIdx = j;
-							return;
 						}
+						return;
 					}
-					return;
+					n = n.parentNode;
+				}
+				if(n == dn && currentArea){
+					t._doBlur(evt, currentArea);
 				}
-				n = n.parentNode;
-			}
-			if(n == dn && currentArea){
-				t._doBlur(evt, currentArea);
 			}
 		},
 
 		_focus: function(evt){
 			var t = this;
-			if(t._tabingOut){
-				t._tabingOut = 0;
-			}else if(evt.target == t.grid.domNode){
-				t._queueIdx = -1;
-				t.tab(1);
-			}else if(evt.target === t.grid.lastFocusNode){
-				t._queueIdx = t._tabQueue.length;
-				t.tab(-1);
+			if(t.arg('enabled')){
+				if(t._tabingOut){
+					t._tabingOut = 0;
+				}else if(evt.target == t.grid.domNode){
+					t._queueIdx = -1;
+					t.tab(1);
+				}else if(evt.target === t.grid.lastFocusNode){
+					t._queueIdx = t._tabQueue.length;
+					t.tab(-1);
+				}
 			}
 		},
 
 		_doBlur: function(evt, area){
 			var t = this;
-			if(!area && t.currentArea()){
-				area = t._areas[t.currentArea()];
-			}
-			if(area){
-				area.onBlur(evt);
-				t.onBlurArea(area.name);
-				t._updateCurrentArea();
+			if(t.arg('enabled')){
+				if(!area && t.currentArea()){
+					area = t._areas[t.currentArea()];
+				}
+				if(area){
+					area.onBlur(evt);
+					t.onBlurArea(area.name);
+					t._updateCurrentArea();
+				}
 			}
 		},
 

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

@@ -14,6 +14,7 @@ define([
 /*=====
 	var GroupHeader = declare(Header, {
 		// summary:
+		//		module name: header.
 		//		The header UI of grid. This implementation supports header groups (also called "column groups").
 		//		This module is not compatible with IE7 and below.
 		//		This module is not compatible with ColumnLock and HiddenColumns.
@@ -409,7 +410,7 @@ define([
 		_onKeyDown: function(evt){
 			var t = this, g = t.grid, col,
 				node = t._curNode;
-			if(!evt.ctrlKey && !evt.altKey &&
+			if(!g._isCtrlKey(evt) && !evt.altKey &&
 				(evt.keyCode == keys.LEFT_ARROW || evt.keyCode == keys.RIGHT_ARROW)){
 				//Prevent scrolling the whole page.
 				g.focus.stopEvent(evt);

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

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

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

@@ -11,6 +11,7 @@ define([
 /*=====
 	return declare(_Module, {
 		// summary:
+		//		module name: hScroller.
 		//		This module provides basic horizontal scrolling for grid
 
 		scrollToColumn: function(colId){

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

@@ -22,6 +22,7 @@ define([
 
 	return declare(_Module, {
 		// summary:
+		//		module name: header.
 		//		The header UI of grid
 		// description:
 		//		This module is in charge of the rendering of the grid header. But it should not manage column width,
@@ -105,6 +106,12 @@ define([
 			});
 			t.aspect(g, 'onHeaderCellMouseOut', function(){
 				g.vLayout.reLayout();
+				//When mouse leave a very narrow nested sorting header, sometimes this reLayout happens before the header height change.
+				//So set a timeout to ensure this gets relayout.
+				//FIXME: need investigate why
+				setTimeout(function(){
+					g.vLayout.reLayout();
+				}, 0);
 			});
 			t._initFocus();
 		},
@@ -273,7 +280,7 @@ define([
 			var t = this, g = t.grid, col,
 				dir = g.isLeftToRight() ? 1 : -1,
 				delta = evt.keyCode == keys.LEFT_ARROW ? -dir : dir;
-			if(t._focusHeaderId && !evt.ctrlKey && !evt.altKey &&
+			if(t._focusHeaderId && !g._isCtrlKey(evt) && !evt.altKey &&
 				(evt.keyCode == keys.LEFT_ARROW || evt.keyCode == keys.RIGHT_ARROW)){
 				//Prevent scrolling the whole page.
 				g.focus.stopEvent(evt);

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

@@ -12,6 +12,7 @@ define([
 /*=====
 	var HeaderMenu = declare(_Module, {
 		// summary:
+		//		module name: headerMenu.
 		//		Add a dropdown menu button on header cell.
 		// description:
 		//		Add a dropdown menu button on the header of any column that has a "menu" defined in structure.

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

@@ -14,6 +14,7 @@ define([
 /*=====
 	return declare(_Module, {
 		// summary:
+		//		module name: headerRegions.
 		//		This module makes it easy to add custom contents to column header.
 		//		Other modules such as NestedSort or HeaderMenu can be based upon this module.
 
@@ -172,7 +173,7 @@ declare(_Module, {
 	},
 
 	_onKey: function(e){
-		if(!e.ctrlKey && !e.shiftKey && !e.altKey){
+		if(!this.grid._isCtrlKey(e) && !e.shiftKey && !e.altKey){
 			var ltr = this.grid.isLeftToRight(),
 				nextKey = ltr ? keys.RIGHT_ARROW : keys.LEFT_ARROW,
 				prevKey = ltr ? keys.LEFT_ARROW : keys.RIGHT_ARROW;

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

@@ -16,6 +16,7 @@ define([
 /*=====
 	return declare(_Module, {
 		// summary:
+		//		module name: indirectSelect.
 		//		This module shows a checkbox(or radiobutton) on the row header when row selection is used.
 		// description:
 		//		This module depends on "rowHeader" and "selectRow" modules.
@@ -49,24 +50,11 @@ define([
 				[sr,'onHighlightChange', '_onHighlightChange' ],
 				[sr,'clear', '_onClear' ],
 				[sr, 'onSelectionChange', '_onSelectionChange'],
-				[g, 'onRowMouseOver', '_onMouseOver'],
-				[g, 'onRowMouseOut', '_onMouseOut'],
+				[g.body, 'onRender', '_onSelectionChange'],
 				[g, 'onRowKeyDown', '_onKeyDown'],
 				[g, 'onHeaderKeyDown', '_onKeyDown'],
-				g.filter && [g.filter, 'onFilter', '_onSelectionChange'],
-				//FIX ME, may have performance issue
-				g.pagination && [g.pagination, 'setPageSize', '_onSelectionChange'],
-				g.pagination && [g.pagination, 'gotoPage', '_onSelectionChange'],
-				focus && [focus, 'onFocusArea', function(name){
-					if(name == 'rowHeader'){
-						t._onMouseOver();
-					}
-				}],
-				focus && [focus, 'onBlurArea', function(name){
-					if(name == 'rowHeader'){
-						t._onMouseOut();
-					}
-				}]);
+				g.filter && [g.filter, 'onFilter', '_onSelectionChange']);
+			g.select.row.holdingCtrl = true;
 			if(sr.selectByIndex && t.arg('all')){
 				t._allSelected = {};
 				rowHeader.headerProvider = lang.hitch(t, t._createSelectAllBox);
@@ -165,21 +153,6 @@ define([
 				node.firstChild.innerHTML = selected ? '✓' : partial ? '▮' : '☐';
 			}
 		},
-		
-		_onMouseOver: function(){
-			var sr = this.grid.select.row;
-			if(!sr.holdingCtrl){
-				this._holdingCtrl = false;
-				sr.holdingCtrl = true;
-			}
-		},
-
-		_onMouseOut: function(){
-			if(this.hasOwnProperty('_holdingCtrl')){
-				this.grid.select.row.holdingCtrl = false;
-				delete this._holdingCtrl;
-			}
-		},
 
 		_getDijitClass: function(){
 			return this._isSingle() ? 'dijitRadio' : 'dijitCheckBox';
@@ -199,7 +172,7 @@ define([
 			]([0, g.view.visualCount - 1]);
 		},
 
-		_onSelectionChange: function(selected){
+		_onSelectionChange: function(){
 			var t = this, d,
 				g = t.grid,
 				allSelected,
@@ -208,7 +181,7 @@ define([
 				start = view.rootStart,
 				count = view.rootCount;
 			if(g.select.row.selectByIndex && t.arg('all')){
-				var selectedRoot = array.filter((lang.isArray(selected) && selected) || g.select.row.getSelected(), function(id){
+				var selectedRoot = array.filter(g.select.row.getSelected(), function(id){
 					return !model.parentId(id);
 				});
 				var unselectableRows = g.select.row._getUnselectableRows();
@@ -276,7 +249,7 @@ define([
 		},
 		_onKeyDown: function(evt){
 			// CTRL - A
-			if(evt.keyCode == 65 && evt.ctrlKey && !evt.shiftKey){
+			if(evt.keyCode == 65 && this.grid._isCtrlKey(evt) && !evt.shiftKey){
 				if(!this._allSelected[this._getPageId()]){
 					this._onSelectAll();
 				}

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

@@ -62,14 +62,14 @@ define([
 					declaredWidth: w,
 					width: w
 				};
+			sr.holdingCtrl = true;
 			t.batchConnect(
 				[g, 'setColumns', '_onSetColumns'],
 				[sr, 'onHighlightChange', '_onHighlightChange' ],
 				[sr, 'onSelectionChange', '_onSelectionChange'],
 				[sr, 'clear', '_onClear'],
+				[g.body, 'onRender', '_onSelectionChange'],
 				g.filter && [g.filter, 'onFilter', '_onSelectionChange'],
-				g.pagination && [g.pagination, 'setPageSize', '_onSelectionChange'],
-				g.pagination && [g.pagination, 'gotoPage', '_onSelectionChange'],
 				[g.body, 'onMoveToCell', function(r, c, e){
 					var evt = {
 						columnId: indirectSelectColumnId
@@ -80,7 +80,6 @@ define([
 						t._onMouseOut();
 					}
 				}],
-				[g.body, 'onRender', '_updateSelectAll'],
 				[g, 'onCellMouseOver', '_onMouseOver'],
 				[g, 'onCellMouseOut', '_onMouseOut']);
 			t._onSetColumns();
@@ -200,10 +199,6 @@ define([
 					this._triggerOnCell = false;
 					sr.triggerOnCell = true;
 				}
-				if(!sr.arg('holdingCtrl')){
-					this._holdingCtrl = false;
-					sr.holdingCtrl = true;
-				}
 			}else{
 				this._onMouseOut();
 			}
@@ -215,10 +210,6 @@ define([
 				sr.triggerOnCell = false;
 				delete this._triggerOnCell;
 			}
-			if(this.hasOwnProperty('_holdingCtrl')){
-				sr.holdingCtrl = false;
-				delete this._holdingCtrl;
-			}
 		},
 
 		_onSelectAll: function(){
@@ -230,7 +221,7 @@ define([
 			]([0, g.view.visualCount - 1]);
 		},
 
-		_onSelectionChange: function(selected){
+		_onSelectionChange: function(){
 			var t = this, d,
 				g = t.grid,
 				allSelected,
@@ -239,7 +230,7 @@ define([
 				start = view.rootStart,
 				count = view.rootCount;
 			if(g.select.row.selectByIndex && t.arg('all')){
-				var selectedRoot = array.filter((lang.isArray(selected) && selected )|| g.select.row.getSelected(), function(id){
+				var selectedRoot = array.filter(g.select.row.getSelected(), function(id){
 					return !model.treePath(id).pop();
 				});
 				var unselectableRows = g.select.row._getUnselectableRows();

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

@@ -11,7 +11,11 @@ define([
 
 /*=====
 	var Menu = declare(_Module, {
-		// context: __MenuContext
+		// summary:
+		//		module name: menu.
+		//		Manage context menu for grid.
+
+		// context: [readonly] __MenuContext
 		//		An object representing the current context when user triggers a context menu.
 		//		This property is updated everytime a menu of grid is popped up.
 		//		Users can refer to this in their menu action handlers by grid.menu.context.

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

@@ -11,6 +11,7 @@ define([
 /*=====
 	return declare(_Module, {
 		// summary:
+		//		module name: navigableCell.
 		//		This module allow the elements in grid cell be focusable.
 		// description:
 		//		When focus is on a cell, press F2 to focus the first focusable element in that cell.
@@ -85,7 +86,8 @@ define([
 							colIndex = g._columnsById[t._focusColId].index,
 							dir = step > 0 ? 1 : -1,
 							checker = function(r, c){
-								return t._isNavigable(g._columns[c].id);
+								//If there's no decorator, we assume there's no focusable elements in this column
+								return t._isNavigable(g._columns[c].id) && g._columns[c].decorator;
 							};
 						body._nextCell(rowIndex, colIndex, dir, checker).then(function(obj){
 							t._focusColId = g._columns[obj.c].id;

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

@@ -18,6 +18,7 @@ define([
 /*=====
 	return declare(_Module, {
 		// summary:
+		//		module name: sort.
 		//		Sort multiple columns in a nested way.
 
 		getSortData: function(){
@@ -208,7 +209,9 @@ define([
 				nls = t._nls,
 				g = t.grid,
 				dn = g.domNode,
-				sortData = t._sortData;
+				sortData = array.filter(t._sortData, function(s){
+					return g._columnsById[s.colId];
+				});
 			removeClass(dn, 'gridxSingleSorted');
 			removeClass(dn, 'gridxNestedSorted');
 			if(sortData.length == 1){