Fixes #17: Keep track of last seen as full name, not just current name

daffl · daffl · commit ce34ac1f887d · 2012-06-11T10:08:08.000-06:00
diff --git a/dom/form_params/form_params.js b/dom/form_params/form_params.js
@@ -14,28 +14,33 @@ steal("jquery/dom").then(function( $ ) {
 				return undefined;
 			}
 			return value;
-		}, 
-		nestData = function( elem, type, data, parts, value, seen ) {
+		},
+		// Access nested data
+		nestData = function( elem, type, data, parts, value, seen, fullName ) {
 			var name = parts.shift();
+			// Keep track of the dot separated fullname. Used to uniquely track seen values
+			// and if they should be converted to an array or not
+			fullName = fullName ? fullName + '.' + name : name;
 
-			if ( parts.length ) {
+			if (parts.length ) {
 				if ( ! data[ name ] ) {
 					data[ name ] = {};
 				}
+
 				// Recursive call
-				nestData( elem, type, data[ name ], parts, value, seen );
+				nestData( elem, type, data[ name ], parts, value, seen, fullName);
 			} else {
 
 				// Handle same name case, as well as "last checkbox checked"
 				// case
-				if ( name in seen && type != "radio" && ! $.isArray( data[ name ] )) {
+				if ( fullName in seen && type != "radio" && ! $.isArray( data[ name ] )) {
 					if ( name in data ) {
 						data[ name ] = [ data[name] ];
 					} else {
 						data[ name ] = [];
 					}
 				} else {
-					seen[ name ] = true;
+					seen[ fullName ] = true;
 				}
 
 				// Finally, assign data
diff --git a/dom/form_params/form_params_test.js b/dom/form_params/form_params_test.js
@@ -81,4 +81,14 @@ test("same input names to array", function() {
 	same(formParams.param1, ['first', 'second', 'third']);
 });
 
+test("#17 duplicate sub-keys", function() {
+	$("#qunit-test-area").html("//jquery/dom/form_params/test/basics.micro",{});
+	var formParams =  $("#qunit-test-area form").formParams(true);
+	ok(!$.isArray(formParams.test.first), 'First value is not an array');
+	equals(formParams.test.first, 'test_first', 'First test value correct');
+	ok(!$.isArray(formParams.bla.first), 'Second value is not an array');
+	equals(formParams.bla.first, 'bla_first', 'Second test value correct');
+	console.log(formParams);
+});
+
 });
diff --git a/dom/form_params/test/basics.micro b/dom/form_params/test/basics.micro
@@ -37,4 +37,7 @@
   <input type='text' name='param1' value='first' />
   <input type='text' name='param1' value='second' />
   <input type='text' name='param1' value='third' />
+
+  <input type='text' name='test[first]' value='test_first' />
+  <input type='text' name='bla[first]' value='bla_first' />
 </form>
