handled nested array, fixed #45

macek · Nov 27, 2014 · 8d5742e · 8d5742e
1 parent 026541a
commit 8d5742e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/dist/jquery.serialize-object.min.js b/dist/jquery.serialize-object.min.js
diff --git a/jquery.serialize-object.js b/jquery.serialize-object.js
@@ -48,14 +48,25 @@
     }
 
     function makeObject(root, value) {
+      var keys = root.match(patterns.key), pushed = false, k, k2 = '';
 
-      var keys = root.match(patterns.key), k;
+      function incrementPush(path, key) {
+        pushes[path] = pushes[path] || {};
+        if (pushes[path][key] === undefined) {
+          pushes[path][key] = 0;
+        }
+        if (pushed) {
+          return pushes[path][key];
+        }
+        pushed = true;
+        return pushes[path][key]++;
+      }
 
       // nest, nest, ..., nest
       while ((k = keys.pop()) !== undefined) {
         // foo[]
         if (patterns.push.test(k)) {
-          var idx = incrementPush(root.replace(/\[\]$/, ''));
+          var idx = incrementPush(keys.join('.'), k2);
           value = build([], idx, value);
         }
 
@@ -67,19 +78,13 @@
         // foo; foo[bar]
         else if (patterns.named.test(k)) {
           value = build({}, k, value);
+          k2 = k;
         }
       }
 
       return value;
     }
 
-    function incrementPush(key) {
-      if (pushes[key] === undefined) {
-        pushes[key] = 0;
-      }
-      return pushes[key]++;
-    }
-
     function encode(pair) {
       switch ($('[name="' + pair.name + '"]', $form).attr("type")) {
         case "checkbox":