gridx-rails 1.2.1 → 1.3.0.pre.alpha

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzkzMDJiMGUwN2VhZWYwYTE0NzVhMzQ1YWEzY2I0ZDlhNzBjYWEyNQ==
+    ZTZkODdhMjEyY2ViNGZhMDg2Yzk4N2IxOTFkNjQwYzgyMmNkZGZlZA==
   data.tar.gz: !binary |-
-    NzVkMzJmMzkwMjcxOGFjMzg1ZTAyNjgwYzQ3ZWJlZWY5ZDc2OTY5Zg==
-!binary "U0hBNTEy":
+    NTlmOWQ0MTE1MDAwMGU4NzUwZjAwMDE2ZjBmMDkzZWEzM2U0NDkwZg==
+SHA512:
   metadata.gz: !binary |-
-    ZjhiNjRiMDZlYjZhODFiMGZiMTJiMDc0ODgwZmIxNWI0NjNlNmVmZDRiYTQw
-    ZTdlMDFjZmFmYjZlZmM0YjgzMGJhMGQzNjJlMzI4OWUwNGEzNmZkMzBjMTg3
-    NTNiYzU4NjQxN2M2MDdmYzYwNDVlZTdhYTEyN2U4OTU4ZTk3ZjY=
+    YTcyNzRiODNiYTk2ZDFlYjcwZTRlMjhmOWI5MjZjNTg5ZDBhNDBmZjg5MGZk
+    M2JkYTIwNDhjMGUyMDFhNGQwMzk3NTdkYWExNGQwNmFhNDNhNzI0MTcxNWY0
+    MjQ1MWYyYzlkNjRjMDE5MWQwZjEwOTkyY2Y5MjJkZGIyZDc1MTM=
   data.tar.gz: !binary |-
-    MDk4NWE1ZmU2YjM2ZWM0ZjQ4ZDcwYzY0MTM0ZWNkZTYyOTU1NGYzMGQyZWE0
-    OTI2NzlkNjAyODQ2ZmVkMjU2NjcyZDY3ZWZkNDA4YzBiMWVhYWMzMzMzMzBi
-    YTM0ZDgwNmJkYTY5ZmRjNmI3ODE5YmIwN2U4NzNlY2VjNmU3ZTk=
+    MmRkMTNmZDRlZjZjMDYyYjhjZTRmMzNmMjgyZDdmZDgyNzczZjBkYjlmYTk5
+    YTVjYzQ1NWM3NzM4M2UxMjc3ZmYyYWI0ZjcwNzM2ZWNlOTNkNjZhOGZkNzUy
+    MDA4MDY2ZTVhNzU1OTU3ZjI5N2Q0ZGNlNmIxMTJmNDY0YzMyZmE=

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

@@ -3,6 +3,7 @@ define([
 	"dojo/_base/lang",
 	"dojo/_base/sniff",
 	"dojo/on",
+	"dojo/i18n",
 	"dojo/dom-class",
 	"dojo/dom-geometry",
 	"dojo/query",
@@ -24,9 +25,10 @@ define([
 	"./modules/ColumnWidth",
 	"./modules/Focus",
 	"dijit/_BidiSupport",
+	"dojo/i18n!./nls/gridx",
 	"dojo/NodeList-dom",
 	"dojo/NodeList-traverse"
-], function(declare, lang, has, on, domClass, domGeometry, query, metrics,
+], function(declare, lang, has, on, i18n, domClass, domGeometry, query, metrics,
 	_WidgetBase, _FocusMixin, _TemplatedMixin, template,
 	Core, Query, _Module, Header, View, Body, VLayout, HLayout, VScroller, HScroller, ColumnWidth, Focus, _BidiSupport){
 
@@ -100,10 +102,21 @@ define([
 			//		protected extension
 			var t = this;
 			t.inherited(arguments);
+			if(t.touch === undefined){
+				t.touch = has('ios') || has('android');
+			}
+			if(t.touch){
+				domClass.add(t.domNode, 'gridxTouch');
+			}else{
+				domClass.add(t.domNode, 'gridxDesktop');
+			}
+			if(!t.isLeftToRight()){
+				domClass.add(t.domNode, 'gridxRtl');
+			}
+			t.nls = i18n.getLocalization('gridx', 'gridx', t.lang);
 			t._eventFlags = {};
 			t.modules = t.coreModules.concat(t.modules || []);
 			t.modelExtensions = t.coreExtensions.concat(t.modelExtensions || []);
-			domClass.toggle(t.domNode, 'gridxRtl', !t.isLeftToRight());
 			t.lastFocusNode.setAttribute('tabIndex', t.domNode.getAttribute('tabIndex'));
 			t._initEvents(t._compNames, t._eventNames);
 			t._init();
@@ -143,9 +156,13 @@ define([
 		//		If true, the grid's width is determined by the total width of the columns, so that there will
 		//		never be horizontal scroller bar.
 		autoWidth: false,
+
+		// touch: Boolean
+		//		Whether grid is run in touch environment
+		//		If undefined, automatically set to true on mobile devices (like ios or android)
+		//touch: undefined,
 	=====*/
 
-		
 		resize: function(changeSize){
 			// summary:
 			//		Resize the grid using given width and height.

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

@@ -5,6 +5,7 @@ define([
 	'gridx/modules/VirtualVScroller',
 	'gridx/modules/SingleSort',
 	'gridx/modules/NestedSort',
+	'gridx/modules/Sort',
 	'gridx/modules/ColumnLock',
 	'gridx/modules/select/Row',
 	'gridx/modules/select/Column',
@@ -41,10 +42,15 @@ define([
 	'gridx/modules/HiddenColumns',
 	'gridx/modules/GroupHeader',
 	'gridx/modules/PagedBody',
-	'gridx/modules/HeaderMenu'
+	'gridx/modules/AutoPagedBody',
+	'gridx/modules/HeaderMenu',
+	'gridx/modules/SlantedHeader',
+	'gridx/modules/ExpandableColumn',
+	'gridx/modules/Layer',
+	'gridx/modules/StructureSwitch'
 ], function(
 	Focus, VScroller, ColumnResizer, VirtualVScroller,
-	SingleSort, NestedSort, ColumnLock,
+	SingleSort, NestedSort, Sort, ColumnLock,
 	SelectRow, SelectColumn, SelectCell,
 	ExtendedSelectRow, ExtendedSelectColumn, ExtendedSelectCell,
 	MoveRow, MoveColumn,
@@ -56,7 +62,9 @@ define([
 	RowHeader, IndirectSelect, IndirectSelectColumn,
 	Persist, Menu, Dod, Tree, RowLock,
 	ToolBar, SummaryBar, Bar, NavigableCell, TouchScroll, TouchVScroller,
-	HiddenColumns, GroupHeader, PagedBody, HeaderMenu){
+	HiddenColumns, GroupHeader, PagedBody, AutoPagedBody,
+	HeaderMenu, SlantedHeader, ExpandableColumn,
+	Layer, StructureSwitch){
 return {
 	Focus: Focus,
 	VScroller: VScroller,
@@ -64,6 +72,7 @@ return {
 	VirtualVScroller: VirtualVScroller,
 	SingleSort: SingleSort,
 	NestedSort: NestedSort,
+	Sort: Sort,
 	ColumnLock: ColumnLock,
 	SelectRow: SelectRow,
 	SelectColumn: SelectColumn,
@@ -100,6 +109,11 @@ return {
 	HiddenColumns: HiddenColumns,
 	GroupHeader: GroupHeader,
 	PagedBody: PagedBody,
-	HeaderMenu: HeaderMenu
+	AutoPagedBody: AutoPagedBody,
+	HeaderMenu: HeaderMenu,
+	SlantedHeader: SlantedHeader,
+	ExpandableColumn: ExpandableColumn,
+	Layer: Layer,
+	StructureSwitch: StructureSwitch
 };
 });

data/app/assets/javascripts/gridx/core/Core.js

@@ -163,12 +163,30 @@ define([
 	}
 
 	function normalizeModules(self){
-		var mods = [],
-			modules = self.modules,
-			len = modules.length;
-		for(var i = 0; i < len; ++i){
-			var m = modules[i];
-			if(isFunc(m) || isString(m)){
+		var mods = self.modules,
+			len = mods.length,
+			modules = [],
+			i, m;
+		for(i = 0; i < len; ++i){
+			m = mods[i];
+			if(isString(m)){
+				try{
+					m = require(m);
+				}catch(e){
+					console.error(e);
+				}
+			}
+			if(lang.isArray(m)){
+				modules = modules.concat(m);
+			}else{
+				modules.push(m);
+			}
+		}
+		mods = [];
+		len = modules.length;
+		for(i = 0; i < len; ++i){
+			m = modules[i];
+			if(isFunc(m)){
 				m = {
 					moduleClass: m
 				};
@@ -303,6 +321,11 @@ define([
 				return lang.mixin({}, col);
 			});
 			t._columnsById = configColumns(t._columns);
+			
+			if(t.edit){			//FIX ME: this is ugly
+								//this will not run in the first setColumns function
+				t.edit._init();
+			}
 			if(t.model){
 				t.model._cache.onSetColumns(t._columnsById);
 			}
@@ -382,6 +405,13 @@ define([
 			t.modelExtensions = t.modelExtensions || [];
 			t.setColumns(t.structure);
 
+			if(t.touch){
+				if(t.touchModules){
+					t.modules = t.modules.concat(t.touchModules);
+				}
+			}else if(t.desktopModules){
+				t.modules = t.modules.concat(t.desktopModules);
+			}
 			normalizeModules(t);
 			checkForced(t);
 			removeDuplicate(t);

data/app/assets/javascripts/gridx/core/model/Model.js

@@ -5,8 +5,9 @@ define([
 	"dojo/_base/lang",
 	"dojo/_base/Deferred",
 	"dojo/DeferredList",
-	"dojo/aspect"
-], function(require, declare, array, lang, Deferred, DeferredList, aspect){
+	"dojo/aspect",
+	"./cache/Sync"
+], function(require, declare, array, lang, Deferred, DeferredList, aspect, Sync){
 
 /*=====
 	return declare([], {
@@ -49,7 +50,7 @@ define([
 
 		indexToId: function(index, parentId){
 			// summary:
-			//		Transform row index to row ID
+			//		Transform row index to row ID. If not exist, return undefined.
 			// index: Integer
 			//		The row index
 			// parentId: String?
@@ -61,7 +62,7 @@ define([
 
 		idToIndex: function(id){
 			// summary:
-			//		Transform row ID to row index
+			//		Transform row ID to row index. If not exist, return -1.
 			// id: String
 			//		The row ID
 			// returns:
@@ -280,7 +281,7 @@ define([
 	return declare([], {
 		constructor: function(args){
 			var t = this,
-				cacheClass = args.cacheClass;
+				cacheClass = args.cacheClass || Sync;
 			cacheClass = typeof cacheClass == 'string' ? require(cacheClass) : cacheClass;
 			t.store = args.store;
 			t._exts = {};

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

@@ -4,11 +4,11 @@ define([
 	"dojo/_base/lang",
 	"dojo/_base/Deferred",
 	"dojo/DeferredList",
-	"./_Cache"
-], function(declare, array, lang, Deferred, DeferredList, _Cache){
+	"./Sync"
+], function(declare, array, lang, Deferred, DeferredList, Sync){
 
 /*=====
-	return declare(_Cache, {
+	return declare(Sync, {
 		// summary:
 		//		Implement lazy-loading for server side store.
 
@@ -34,13 +34,15 @@ define([
 		var i, r, len, pid,
 			ranges = args.range,
 			isTree = self.store.getChildren;
-		args.pids = {
-			'': args.range
-		};
+		args.pids = {};
+		args.pids[self.layerId()] = args.range;
 		if(isTree){
 			for(i = ranges.length - 1; i >= 0; --i){
 				r = ranges[i];
 				pid = r.parentId;
+				if(!self.model.isId(pid)){
+					pid = self.layerId();
+				}
 				if(self.model.isId(pid)){
 					args.id.push(pid);
 					args.pids[pid] = args.pids[pid] || [];
@@ -351,7 +353,7 @@ define([
 		func(ids);
 	}
 
-	return declare(_Cache, {
+	return declare(Sync, {
 		isAsync: true,
 
 		constructor: function(model, args){