gridx-rails 1.1.0 → 1.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDkxNzQxZWUyZWNmZDI3ZjhjNDI4Yjc4M2YwN2FkNDRiMmUyMWFmMQ==
+    NzkzMDJiMGUwN2VhZWYwYTE0NzVhMzQ1YWEzY2I0ZDlhNzBjYWEyNQ==
   data.tar.gz: !binary |-
-    ZjliNzU1YmNmYmJiY2I5YWI4ZjQ3ODM0ZDZiMzNkZDE1ODBhNjAwMQ==
+    NzVkMzJmMzkwMjcxOGFjMzg1ZTAyNjgwYzQ3ZWJlZWY5ZDc2OTY5Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTM1ZjlhM2U5MmUwY2Y0OTJhZTk4M2U1NzFkNWJkNTczMDM2MTcyMTM4MTli
-    ZDQ2ZDhjZTdjNDYwNGNmNzMyY2Q5ZWE1ZWQwNDMyNDcyM2Q1ZGFjODMzZDJh
-    MjU3NDc5MjVjZGIxNmI1MmRjZjI2NDA0YWNhMTA4ZjI0Y2I1ZDE=
+    ZjhiNjRiMDZlYjZhODFiMGZiMTJiMDc0ODgwZmIxNWI0NjNlNmVmZDRiYTQw
+    ZTdlMDFjZmFmYjZlZmM0YjgzMGJhMGQzNjJlMzI4OWUwNGEzNmZkMzBjMTg3
+    NTNiYzU4NjQxN2M2MDdmYzYwNDVlZTdhYTEyN2U4OTU4ZTk3ZjY=
   data.tar.gz: !binary |-
-    YzRlNDcyYzNlZWVhYjg0MWZiMzc2NTMyOGI2ZGY0ZWQ2NGVmMzM0ZjI2OThi
-    MjY4MTYyZTFhZThkMDQ3ZDg0NjdkZTBiM2YxMjA0MDRkODUwNGY5ZjI5NjBl
-    MzFmYmNkNDU0YmNhODYxNzgwZmU2ZDdkZWZiYmJmMmIyZjU0YWM=
+    MDk4NWE1ZmU2YjM2ZWM0ZjQ4ZDcwYzY0MTM0ZWNkZTYyOTU1NGYzMGQyZWE0
+    OTI2NzlkNjAyODQ2ZmVkMjU2NjcyZDY3ZWZkNDA4YzBiMWVhYWMzMzMzMzBi
+    YTM0ZDgwNmJkYTY5ZmRjNmI3ODE5YmIwN2U4NzNlY2VjNmU3ZTk=

data/README.md

@@ -1,12 +1,12 @@
 # gridx-rails
 
-This gem packages [GridX](http://oria.github.io/gridx/) 1.1.0 assets (JavaScripts, stylesheets, 
+This gem prepares [GridX](http://oria.github.io/gridx/) assets (JavaScripts, stylesheets,
 templates and and images) for the Rails 3.1+ [asset
 pipeline](http://guides.rubyonrails.org/asset_pipeline.html).
 
 GridX is designed to load modules using Dojo AMD, so the files are not
-packaged together in the typical asset pipeline style, they are instead
-minified separately.
+packaged together in a single file, in the typical asset pipeline style,
+they are instead precompiled separately.
 
 ## Usage
 

data/app/assets/javascripts/gridx/Grid.js

@@ -180,7 +180,8 @@ define([
 		_compNames: ['Cell', 'HeaderCell', 'Row', 'Header'],
 	
 		_eventNames: [
-			'Click', 'DblClick', 
+			'TouchStart', 'TouchEnd',
+			'Click', 'DblClick',
 			'MouseDown', 'MouseUp', 
 			'MouseOver', 'MouseOut', 
 			'MouseMove', 'ContextMenu',
@@ -214,7 +215,7 @@ define([
 		},
 		//event handling end
 
-		_isCopyEvent: function(evt){
+		_isCtrlKey: function(evt){
 			// summary:
 			//		On Mac Ctrl+click also opens a context menu. So call this to check ctrlKey instead of directly call evt.ctrlKey
 			//		if you need to implement some handler for Ctrl+click.

data/app/assets/javascripts/gridx/core/model/cache/_Cache.js

@@ -68,6 +68,7 @@ define([
 			//virtual root node, with id ''.
 			t._struct[''] = [];
 			t._size[''] = -1;
+			t.totalSize = undefined;
 		},
 
 		byIndex: function(index, parentId){
@@ -163,7 +164,7 @@ define([
 				c = t._cache[id];
 				for(colId in columns){
 					col = columns[colId];
-					c.data[colId] = t._formatCell(col.id, c.rawData);
+					c.data[colId] = t._formatCell(c.rawData, id, col.id);
 				}
 			}
 		},
@@ -181,15 +182,15 @@ define([
 			return item;
 		},
 
-		_formatCell: function(colId, rawData){
+		_formatCell: function(rawData, rowId, colId){
 			var col = this.columns[colId];
-			return col.formatter ? col.formatter(rawData) : rawData[col.field || colId];
+			return col.formatter ? col.formatter(rawData, rowId) : rawData[col.field || colId];
 		},
 
-		_formatRow: function(rowData){
+		_formatRow: function(rowData, rowId){
 			var cols = this.columns, res = {}, colId;
 			for(colId in cols){
-				res[colId] = this._formatCell(colId, rowData);
+				res[colId] = this._formatCell(rowData, rowId, colId);
 			}
 			return res;
 		},
@@ -218,7 +219,7 @@ define([
 				pr.push(id);
 			}
 			t._cache[id] = {
-				data: t._formatRow(rowData),
+				data: t._formatRow(rowData, id),
 				rawData: rowData,
 				item: item
 			};
@@ -244,6 +245,15 @@ define([
 				t._size[parentId] = parseInt(size, 10);
 			}
 			function onComplete(items){
+				//FIXME: store does not support getting total size after filter/query, so we must change the protocal a little.
+				if(items.ioArgs && items.ioArgs.xhr){
+					var range = results.ioArgs.xhr.getResponseHeader("Content-Range");
+					if(range && (range = range.match(/(.+)\//))){
+						t.totalSize = +range[1];
+					}else{
+						t.totalSize = undefined;
+					}
+				}
 				try{
 					var start = options.start || 0,
 						i = 0,
@@ -308,15 +318,19 @@ define([
 				row = t._itemToObject(item),
 				parentItem = parentInfo && parentInfo[s.fetch ? 'item' : 'parent'],
 				parentId = parentItem ? s.getIdentity(parentItem) : '',
+				id = s.getIdentity(item),
 				size = t._size[''];
 			t.clear();
-			t.onNew(s.getIdentity(item), 0, {
-				data: t._formatRow(row),
+			t.onNew(id, 0, {
+				data: t._formatRow(row, id),
 				rawData: row,
 				item: item
 			});
 			if(!parentItem && size >= 0){
 				t._size[''] = size + 1;
+				if(t.totalSize >= 0){
+					t.totalSize = size + 1;
+				}
 				t.model._onSizeChange();
 			}
 		},
@@ -359,6 +373,9 @@ define([
 				t.onDelete(id, index - 1, path);
 				if(!parentId && size >= 0){
 					sz[''] = size - 1;
+					if(t.totalSize >= 0){
+						t.totalSize = size - 1;
+					}
 					t.model._onSizeChange();
 				}
 			}else{

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

@@ -11,9 +11,8 @@ define([
 
 /*=====
 	var Bar = declare(_Module, {
-		// module:
-		//		gridx/modules/Bar
 		// summary:
+		//		module name: bar.
 		//		This is a general-purpose bar for gridx.
 		// description:
 		//		This module can be configured to hold various plugins, such as pager, pageSizer, gotoPageButton, summary, quickFilter, toobar, etc.

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

@@ -43,6 +43,7 @@ define([
 
 	var Body = declare(_Module, {
 		// summary:
+		//		module name: body.
 		//		The body UI of grid.
 		// description:
 		//		This module is in charge of row rendering. It should be compatible with virtual/non-virtual scroll, 
@@ -250,7 +251,7 @@ define([
 					query('> .gridxRowOver', t.domNode).removeClass('gridxRowOver');
 				}
 			});
-			t.aspect(g, 'setStore', function(){
+			t.aspect(g.model, 'setStore', function(){
 				t.refresh();
 			});
 		},
@@ -544,7 +545,10 @@ define([
 					var scrollTop = isRefresh ? n.scrollTop : 0;
 					n.scrollTop = 0;
 					//unrender before destroy nodes, so that other modules have a chance to detach nodes.
-					t.onUnrender();
+					if(!t._skipUnrender){
+						//only when we do have something to unrender
+						t.onUnrender();
+					}
 					n.innerHTML = str;
 					if(scrollTop){
 						n.scrollTop = scrollTop;
@@ -565,7 +569,10 @@ define([
 			}else if(!{top: 1, bottom: 1}[position]){
 				n.scrollTop = 0;
 				//unrender before destroy nodes, so that other modules have a chance to detach nodes.
-				t.onUnrender();
+				if(!t._skipUnrender){
+					//only when we do have something to unrender
+					t.onUnrender();
+				}
 				n.innerHTML = '';
 				en.innerHTML = emptyInfo;
 				en.style.zIndex = '';
@@ -919,16 +926,17 @@ define([
 			});
 			t.connect(g.mainNode, 'onkeydown', function(evt){
 				if(focus.currentArea() == 'body'){
-					var dk = keys;
-					if(evt.keyCode == dk.HOME && !evt.ctrlKey){
+					var dk = keys,
+						ctrlKey = g._isCtrlKey(evt);
+					if(evt.keyCode == dk.HOME && !ctrlKey){
 						t._focusCellCol = 0;
 						t._focusCell();
 						focus.stopEvent(evt);
-					}else if(evt.keyCode == dk.END && !evt.ctrlKey){
+					}else if(evt.keyCode == dk.END && !ctrlKey){
 						t._focusCellCol = g._columns.length - 1;
 						t._focusCell();
 						focus.stopEvent(evt);
-					}else if(!g.tree || !evt.ctrlKey){
+					}else if(!g.tree || !ctrlKey){
 						focus._noBlur = 1;	//1 as true
 						var arr = {}, dir = g.isLeftToRight() ? 1 : -1;
 						arr[dk.LEFT_ARROW] = [0, -dir, evt];

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

@@ -25,6 +25,7 @@ define([
 
 	var CellWidget = declare(_Module, {
 		// summary:
+		//		module name: cellWidget.
 		//		This module makes it possible to efficiently show widgets within a grid cell.
 		// description:
 		//		Since widget declarations need to be parsed by dojo.parser, it can NOT be directly
@@ -110,6 +111,8 @@ define([
 		//		CellWidget module reuses widgets in cell, so if there is no widgets in cell, you don't need this module at all.
 		widgetsInCell: false,
 
+		allowEventBubble: false,
+
 		decorator: function(){
 			// summary:
 			//		This decorator function is slightly different from the one when this module is not used.
@@ -203,13 +206,14 @@ define([
 			},
 
 			postCreate: function(){
-				var dn = this.domNode;
-				this.connect(dn, 'onmousedown', function(e){
-					if(e.target != dn){
+				var t = this,
+					dn = t.domNode;
+				t.connect(dn, 'onmousedown', function(e){
+					if(e.target != dn && !t.cell.column.allowEventBubble){
 						e.cancelBubble = true;
 					}
 				});
-				this._cellCnnts = [];
+				t._cellCnnts = [];
 			},
 
 			startup: function(){

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

@@ -14,6 +14,7 @@ define([
 /*=====
 	return declare(_Module, {
 		// summary:
+		//		module name: columnLock.
 		//		Column lock machinery.
 		// description:
 		//		This module provides a way to lock consecutive leading columns. 
@@ -64,15 +65,16 @@ define([
 					_this.connect(g.body, 'onAfterRow', function(row){
 						_this._lockColumns(row.node());
 					});
-					
-					_this.connect(g.header, 'onRender', '_updateHeader');
 					_this.connect(g.columnWidth, 'onUpdate', '_updateHeader');
-					_this.connect(g, 'resize', '_updateUI');
+					_this.connect(g.header, 'onRender', '_updateHeader');
 					if(g.columnResizer){
 						//make it compatible with column resizer
 						_this.connect(g.columnResizer, 'onResize', '_updateHeader');
 						_this.connect(g.columnResizer, 'onResize', '_updateBody');
 					}
+
+					_this.connect(g, '_onResizeEnd', '_updateHeader');
+					_this.connect(g, '_onResizeEnd', '_updateBody');
 					if(g.header){
 						g.header.loaded.then(function(){
 							_this._updateHeader();
@@ -130,6 +132,7 @@ define([
 			}
 			rowNode.style[ltr ? 'paddingLeft' : 'paddingRight'] = '0px';
 			rowNode.style.width = 'auto';
+			rowNode.firstChild.style.height = 'auto';
 		},
 		
 		_updateUI: function(){
@@ -152,6 +155,7 @@ define([
 			var isHeader = domClass.contains(rowNode, 'gridxHeaderRowInner');
 			var ltr = this.grid.isLeftToRight();
 			var r = rowNode.firstChild.rows[0], i;
+			rowNode.firstChild.style.height = 'auto';	//Remove the height of the last locked state.
 			for(i = 0; i < this.count; i++){
 				domStyle.set(r.cells[i], 'height', 'auto');
 			}
@@ -159,17 +163,16 @@ define([
 			var h1 = domGeometry.getContentBox(r.cells[r.cells.length - 1]).h, 
 				h2 = domGeometry.getMarginBox(r.cells[r.cells.length - 1]).h;
 
-			if(has('ie') > 8){		
+			if(has('ie') > 8){
 				//in IE 9 +, sometimes computed height will contain decimal pixels like 34.4 px, 
 				//so that the locked cells will have different height with the unlocked ones.
 				//plus the height by 1 can force IE to ceil the decimal to integer like from 34.4px to 35px
-				
-				h3 = domStyle.getComputedStyle(rowNode.firstChild).height;
+				var h3 = domStyle.getComputedStyle(rowNode.firstChild).height;
 				if(String(h3).toString().indexOf('.') >= 0){		//decimal
 					h2++;
 					h1++;
 				}
-			}	
+			}
 			domStyle.set(rowNode.firstChild, 'height', h2 + 'px');
 			
 			var lead = isHeader ? this.grid.hLayout.lead : 0,
@@ -179,11 +182,8 @@ define([
 				var cell = r.cells[i],
 					s;
 				domClass.add(cell, 'gridxLockedCell');
-				// if(has('ie') > 8){
-					// s = {height: h1 + 1 + 'px'};
-				// }else{
-					s = {height: h1 + 'px'};
-				// }
+
+				s = {height: h1 + 'px'};
 				s[ltr ? 'left' : 'right'] = pl + 'px';
 				domStyle.set(cell, s);
 				

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

@@ -9,10 +9,10 @@ define([
 	"dojo/dom-geometry",
 	"dojo/keys",
 	"dojo/query",
-	'dojo/sniff',
+	"dojo/_base/sniff",
 	"../core/_Module"
 //    "dojo/NodeList-traverse"
-], function(declare, win, event, dom, domStyle, domClass, domConstruct, domGeometry, keys, query, sniff,  _Module){
+], function(declare, win, event, dom, domStyle, domClass, domConstruct, domGeometry, keys, query, has, _Module){
 
 /*=====
 	Column.setWidth = function(width){
@@ -22,6 +22,7 @@ define([
 
 	return declare(_Module, {
 		// summary:
+		//		module name: columnResizer.
 		//		Column Resizer machinery.
 		// description:
 		//		This module provides a way to resize column width. 
@@ -108,10 +109,8 @@ define([
 					cs.maxWidth = width + 'px';
 				});
 				g.body.onRender();
+				g.hLayout.reLayout();
 				g.vLayout.reLayout();
-				if(g.autoWidth){
-					g.hLayout.reLayout();
-				}
 				t.onResize(colId, width, oldWidth);
 			}
 		},
@@ -157,7 +156,7 @@ define([
 		_mouseout: function(e){
 			if(!this._resizing){
 				var pos = domGeometry.position(this.grid.header.domNode);
-				if(sniff('chrome')){
+				if(has('chrome')){
 					for(var i in pos){
 						pos[i] = Math.floor(pos[i]);
 					}
@@ -262,11 +261,11 @@ define([
 		},
 
 		_keydown: function(evt){
+			var t = this,
+				g = t.grid;
 			//support keyboard to resize a column
-			if((evt.keyCode == keys.LEFT_ARROW || evt.keyCode == keys.RIGHT_ARROW) && evt.ctrlKey && evt.shiftKey){
-				var t = this,
-					g = t.grid,
-					colId = evt.columnId,
+			if((evt.keyCode == keys.LEFT_ARROW || evt.keyCode == keys.RIGHT_ARROW) && g._isCtrlKey(evt) && evt.shiftKey){
+				var colId = evt.columnId,
 					cellNode = query('[colid="' + g._escapeId(colId) + '"].gridxCell', g.header.innerNode)[0],
 					step = t.arg('step');
 				step = evt.keyCode == keys.LEFT_ARROW ^ !!g.isLeftToRight() ? step : -step;

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

@@ -17,6 +17,7 @@ define([
 /*=====
 	return declare(_Module, {
 		// summary:
+		//		module name: dod.
 		//		Details on demand.
 
 		// useAnimation: Boolean

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

@@ -415,7 +415,12 @@ define([
 				t.connect(g.body, 'onAfterCell', _onAftercell);
 			}
 			g.domNode.removeAttribute('aria-readonly');
-			t.connect(g, 'onCellDblClick', '_onUIBegin');
+			t.connect(g, 'onCellDblClick', function(evt){
+				if(!domClass.contains(evt.target, 'gridxTreeExpandoIcon') &&
+					!domClass.contains(evt.target, 'gridxTreeExpandoInner')){
+					t._onUIBegin(evt);
+				}
+			});
 			t.connect(g.cellWidget, 'onCellWidgetCreated', '_onCellWidgetCreated');
 			t.connect(g.cellWidget, 'initializeCellWidget', function(widget, cell){
 				var column = cell.column;
@@ -774,7 +779,10 @@ define([
 							var delay = column.editorArgs && column.editorArgs.applyDelay || 500;
 							clearTimeout(editor._timeoutApply);
 							editor._timeoutApply = setTimeout(function(){
-								t.apply(rn.getAttribute('rowid'), column.id);
+								var rowId = rn.getAttribute('rowid');
+								t.apply(rowId, column.id).then(function(){
+									t._focusEditor(rowId, column.id);
+								});
 							}, delay);
 						}
 					});
@@ -965,19 +973,14 @@ define([
 			this._editing = false;
 			var focus = this.grid.focus;
 			if(focus){
-				if(has('ie')){
-					setTimeout(function(){
-						focus.focusArea('body');
-					}, 1);
-				}else{
-					focus.focusArea('body');
-				}
+				focus.focusArea('body');
 			}
 		},
 		
 		_onKey: function(e){
 			var t = this,
 				g = t.grid,
+				ctrlKey = g._isCtrlKey(e),
 				col = g._columnsById[e.columnId];
 			if(col.editable){
 				var editing = t.isEditing(e.rowId, e.columnId);
@@ -1000,24 +1003,24 @@ define([
 					t.cancel(e.rowId, e.columnId).then(lang.hitch(t, t._blur)).then(function(){
 						g.focus.focusArea('body');
 					});
-				}else if(e.keyCode == 'Z'.charCodeAt(0) && e.ctrlKey){
+				}else if(e.keyCode == 'Z'.charCodeAt(0) && ctrlKey){
 					if(t.arg('lazySave')){
 						t.model.undo();
 					}
-				}else if(e.keyCode == 'Y'.charCodeAt(0) && e.ctrlKey){
+				}else if(e.keyCode == 'Y'.charCodeAt(0) && ctrlKey){
 					if(t.arg('lazySave')){
 						t.model.redo();
 					}
-				}else if(e.keyCode == 'S'.charCodeAt(0) && e.ctrlKey){
+				}else if(e.keyCode == 'S'.charCodeAt(0) && ctrlKey){
 					if(t.arg('lazySave')){
 						t.model.save();
 						e.preventDefault();
 					}
 				}
 			}
-			if(t._editing && e.keyCode !== keys.TAB){
-				e.stopPropagation();
-			}
+//            if(t._editing && e.keyCode !== keys.TAB){
+//                e.stopPropagation();
+//            }
 		}
 		
 	});