Fixed JSON converter bug

daffl · daffl · commit 9c657bcefb43 · 2011-03-19T13:53:42.000-06:00
diff --git a/src/dform.converters.js b/src/dform.converters.js
@@ -22,8 +22,7 @@
 				},
 				"integer" :
 				{
-					"type" : "text",
-					"validate" : "int"
+					"type" : "text"
 				}
 			}
 		}
@@ -36,25 +35,29 @@
 			return data;
 		},
 
-		"json" : function(data)
+		"json" : function(data, path)
 		{
 			var converters = $.dform.options.converters.json.types;
 			var getElements = function(obj)
 			{
 				var result = [];
-				$.each(data, function(key, value)
+				$.each(obj, function(key, value)
 				{
 					var instance = typeof (value);
 					var element;
-					if (instance == 'object')
+					if($.isArray(value))
+					{
+						alert(key + ' is an array');
+					} else if($.isPlainObject(value))
 					{
 						element =
 						{
 							'type' : 'fieldset',
-							'caption' : key
+							'caption' : key,
+							'elements' : getElements(value)
 						};
-						// element.elements = getElements(value);
-					} else
+					}
+					else
 					{
 						var baseElement = converters[instance] || { 'type' : 'text' };
 						element = $.extend(baseElement, { 'caption' : key, 'name' : key, 'value' : value });
@@ -63,6 +66,7 @@
 				});
 				return result;
 			};
+			
 			return {
 				"type" : "form",
 				"elements" : getElements(data)

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,7 @@`
`22`	`22`	`},`
`23`	`23`	`"integer" :`
`24`	`24`	`{`
`25`		`- "type" : "text",`
`26`		`- "validate" : "int"`
	`25`	`+ "type" : "text"`
`27`	`26`	`}`
`28`	`27`	`}`
`29`	`28`	`}`
`@@ -36,25 +35,29 @@`
`36`	`35`	`return data;`
`37`	`36`	`},`
`38`	`37`
`39`		`- "json" : function(data)`
	`38`	`+ "json" : function(data, path)`
`40`	`39`	`{`
`41`	`40`	`var converters = $.dform.options.converters.json.types;`
`42`	`41`	`var getElements = function(obj)`
`43`	`42`	`{`
`44`	`43`	`var result = [];`
`45`		`- $.each(data, function(key, value)`
	`44`	`+ $.each(obj, function(key, value)`
`46`	`45`	`{`
`47`	`46`	`var instance = typeof (value);`
`48`	`47`	`var element;`
`49`		`- if (instance == 'object')`
	`48`	`+ if($.isArray(value))`
	`49`	`+ {`
	`50`	`+ alert(key + ' is an array');`
	`51`	`+ } else if($.isPlainObject(value))`
`50`	`52`	`{`
`51`	`53`	`element =`
`52`	`54`	`{`
`53`	`55`	`'type' : 'fieldset',`
`54`		`- 'caption' : key`
	`56`	`+ 'caption' : key,`
	`57`	`+ 'elements' : getElements(value)`
`55`	`58`	`};`
`56`		`- // element.elements = getElements(value);`
`57`		`- } else`
	`59`	`+ }`
	`60`	`+ else`
`58`	`61`	`{`
`59`	`62`	`var baseElement = converters[instance] \|\| { 'type' : 'text' };`
`60`	`63`	`element = $.extend(baseElement, { 'caption' : key, 'name' : key, 'value' : value });`
`@@ -63,6 +66,7 @@`
`63`	`66`	`});`
`64`	`67`	`return result;`
`65`	`68`	`};`
	`69`	`+`
`66`	`70`	`return {`
`67`	`71`	`"type" : "form",`
`68`	`72`	`"elements" : getElements(data)`