Use relative path in define so that gridx does not have to be a root …

…package
oria · Dec 5, 2013 · 754bac6 · 754bac6
1 parent 268da73
commit 754bac6
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 58 deletions.
diff --git a/Grid.js b/Grid.js
@@ -30,7 +30,7 @@ define([
 	"dojo/NodeList-traverse"
 ], 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){
+	Core, Query, _Module, Header, View, Body, VLayout, HLayout, VScroller, HScroller, ColumnWidth, Focus, _BidiSupport, nls){
 
 	var dummyFunc = function(){};
 
@@ -113,7 +113,8 @@ define([
 			if(!t.isLeftToRight()){
 				domClass.add(t.domNode, 'gridxRtl');
 			}
-			t.nls = i18n.getLocalization('gridx', 'gridx', t.lang);
+			//in case gridx is not a root level package, it should still work
+			t.nls = i18n.getLocalization('gridx', 'gridx', t.lang) || nls;
 			t._eventFlags = {};
 			t.modules = t.coreModules.concat(t.modules || []);
 			t.modelExtensions = t.coreExtensions.concat(t.modelExtensions || []);

diff --git a/allModules.js b/allModules.js
@@ -1,53 +1,53 @@
 define([
-	'gridx/modules/Focus',
-	'gridx/modules/VScroller',
-	'gridx/modules/ColumnResizer',
-	'gridx/modules/VirtualVScroller',
-	'gridx/modules/SingleSort',
-	'gridx/modules/NestedSort',
-	'gridx/modules/Sort',
-	'gridx/modules/ColumnLock',
-	'gridx/modules/select/Row',
-	'gridx/modules/select/Column',
-	'gridx/modules/select/Cell',
-	'gridx/modules/extendedSelect/Row',
-	'gridx/modules/extendedSelect/Column',
-	'gridx/modules/extendedSelect/Cell',
-	'gridx/modules/move/Row',
-	'gridx/modules/move/Column',
-	'gridx/modules/dnd/Row',
-	'gridx/modules/dnd/Column',
-	'gridx/modules/Pagination',
-	'gridx/modules/pagination/PaginationBar',
-	'gridx/modules/pagination/PaginationBarDD',
-	'gridx/modules/Filter',
-	'gridx/modules/filter/FilterBar',
-	'gridx/modules/filter/QuickFilter',
-	'gridx/modules/CellWidget',
-	'gridx/modules/Edit',
-	'gridx/modules/RowHeader',
-	'gridx/modules/IndirectSelect',
-	'gridx/modules/IndirectSelectColumn',
-	'gridx/modules/Persist',
-	'gridx/modules/Menu',
-	'gridx/modules/Dod',
-	'gridx/modules/Tree',
-	'gridx/modules/RowLock',
-	'gridx/modules/ToolBar',
-	'gridx/modules/SummaryBar',
-	'gridx/modules/Bar',
-	'gridx/modules/NavigableCell',
-	'gridx/modules/TouchScroll',
-	'gridx/modules/TouchVScroller',
-	'gridx/modules/HiddenColumns',
-	'gridx/modules/GroupHeader',
-	'gridx/modules/PagedBody',
-	'gridx/modules/AutoPagedBody',
-	'gridx/modules/HeaderMenu',
-	'gridx/modules/SlantedHeader',
-	'gridx/modules/ExpandableColumn',
-	'gridx/modules/Layer',
-	'gridx/modules/StructureSwitch'
+	'./modules/Focus',
+	'./modules/VScroller',
+	'./modules/ColumnResizer',
+	'./modules/VirtualVScroller',
+	'./modules/SingleSort',
+	'./modules/NestedSort',
+	'./modules/Sort',
+	'./modules/ColumnLock',
+	'./modules/select/Row',
+	'./modules/select/Column',
+	'./modules/select/Cell',
+	'./modules/extendedSelect/Row',
+	'./modules/extendedSelect/Column',
+	'./modules/extendedSelect/Cell',
+	'./modules/move/Row',
+	'./modules/move/Column',
+	'./modules/dnd/Row',
+	'./modules/dnd/Column',
+	'./modules/Pagination',
+	'./modules/pagination/PaginationBar',
+	'./modules/pagination/PaginationBarDD',
+	'./modules/Filter',
+	'./modules/filter/FilterBar',
+	'./modules/filter/QuickFilter',
+	'./modules/CellWidget',
+	'./modules/Edit',
+	'./modules/RowHeader',
+	'./modules/IndirectSelect',
+	'./modules/IndirectSelectColumn',
+	'./modules/Persist',
+	'./modules/Menu',
+	'./modules/Dod',
+	'./modules/Tree',
+	'./modules/RowLock',
+	'./modules/ToolBar',
+	'./modules/SummaryBar',
+	'./modules/Bar',
+	'./modules/NavigableCell',
+	'./modules/TouchScroll',
+	'./modules/TouchVScroller',
+	'./modules/HiddenColumns',
+	'./modules/GroupHeader',
+	'./modules/PagedBody',
+	'./modules/AutoPagedBody',
+	'./modules/HeaderMenu',
+	'./modules/SlantedHeader',
+	'./modules/ExpandableColumn',
+	'./modules/Layer',
+	'./modules/StructureSwitch'
 ], function(
 	Focus, VScroller, ColumnResizer, VirtualVScroller,
 	SingleSort, NestedSort, Sort, ColumnLock,

diff --git a/modules/Body.js b/modules/Body.js
@@ -3,7 +3,7 @@ define([
 /*====="../core/Cell",=====*/
 	"dojo/_base/declare",
 	// "dojo/query",
-	'gridx/support/query',
+	'../support/query',
 	"dojo/_base/array",
 	"dojo/_base/lang",
 	"dojo/_base/json",
@@ -857,7 +857,8 @@ define([
 					e.columnId = col.id;
 					e.columnIndex = col.index;
 				}
-				if(tag == 'div' && domClass.contains(n, 'gridxRow') && n.parentNode === g.bodyNode){
+				if(tag == 'table' && domClass.contains(n, 'gridxRowTable') && n.parentNode.parentNode === g.bodyNode){
+					n = n.parentNode;
 					e.rowId = n.getAttribute('rowid');
 					e.parentId = n.getAttribute('parentid');
 					e.rowIndex = parseInt(n.getAttribute('rowindex'), 10);

diff --git a/modules/ColumnWidth.js b/modules/ColumnWidth.js
@@ -3,7 +3,7 @@ define([
 	"dojo/_base/array",
 	"dojo/_base/Deferred",
 	// "dojo/query",
-	'gridx/support/query',
+	'../support/query',
 	"dojo/_base/sniff",
 	"dojo/dom-geometry",
 	"dojo/dom-class",

diff --git a/modules/Dod.js b/modules/Dod.js
@@ -11,7 +11,7 @@ define([
 	"dojo/_base/fx",
 	"dojo/fx",
 	"dojo/keys",
-	'gridx/support/query',
+	'../support/query',
 	'dijit/a11y',
 	'dijit/registry',
 	'dojo/_base/event',

diff --git a/modules/RowHeader.js b/modules/RowHeader.js
@@ -1,7 +1,7 @@
 define([
 	"dojo/_base/declare",
 	// "dojo/query",
-	'gridx/support/query',
+	'../support/query',
 	"dojo/_base/lang",
 	"dojo/_base/sniff",
 	"dojo/aspect",

diff --git a/modules/VirtualVScroller.js b/modules/VirtualVScroller.js
@@ -6,7 +6,7 @@ define([
 	"dojo/_base/event",
 	"dojo/_base/Deferred",
 	// "dojo/query",
-	'gridx/support/query',
+	'../support/query',
 	"dojo/keys",
 	"./VScroller",
 	"../core/_Module"

diff --git a/modules/dnd/_Dnd.js b/modules/dnd/_Dnd.js
@@ -63,7 +63,7 @@ define([
 
 		load: function(args){
 			var t = this,
-				n = t.grid.mainNode;
+				n = t.arg('sourceNode', t.grid.mainNode);
 			t._source = new Source(n, {
 				isSource: false,
 				accept: t.accept,