fix other places where jsonxml appear

tonytomov · Feb 12, 2015 · 0c0ff7c · 0c0ff7c
1 parent d2e61e7
commit 0c0ff7c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -19,7 +19,7 @@ var
 		"jqDnR",
 		"jqModal",
 		"jquery.fmatter",
-		"JsonXml"
+		"grid.utils"
 	],
 
 	gridFiles = allFiles.map(function( file ) {

diff --git a/build.xml b/build.xml
@@ -13,7 +13,7 @@
 		<fileset file="js/grid.base.js"/>
 		<fileset file="js/jqModal.js"/>
 		<fileset file="js/jqDnR.js"/>
-		<fileset file="js/JsonXml.js"/>
+		<fileset file="js/grid.utils.js"/>
 		<fileset file="js/jquery.fmatter.js"/>
 		<fileset file="js/grid.common.js"/>
 		<fileset file="js/grid.filter.js"/>

diff --git a/jqGrid.js b/jqGrid.js
@@ -17,7 +17,7 @@ require([
 	"jqgrid/jqDnR",
 	"jqgrid/jqModal",
 	"jqgrid/jquery.fmatter",
-	"jqgrid/JsonXml",
+	"jqgrid/grid.utils",
 	"jqgrid/addons/ui.multiselect"
 
 ], function ($) {

diff --git a/jquery.jqGrid.js b/jquery.jqGrid.js
@@ -17,7 +17,7 @@ function jqGridInclude()
         { include: true, incfile:'grid.tbltogrid.js'}, //jqGrid table to grid 
         { include: true, incfile:'grid.import.js'}, //jqGrid import
         { include: true, incfile:'jquery.fmatter.js'}, //jqGrid formater
-        { include: true, incfile:'JsonXml.js'}, //xmljson utils
+        { include: true, incfile:'grid.utils.js'}, //xmljson utils
         { include: true, incfile:'grid.jqueryui.js'}, //jQuery UI utils
         { include: true, incfile:'grid.filter.js'} // filter Plugin
     ];

diff --git a/js/grid.formedit.js b/js/grid.formedit.js
@@ -6,7 +6,6 @@
 		// AMD. Register as an anonymous module.
 		define([
 			"jquery",
-			"./JsonXml",
 			"./grid.base",
 			"./grid.common"
 		], factory );