Merge pull request ryanb#266 from kirel/fix-parent-has-no-input

lest · lest · commit 42028bc06e72 · 2013-06-18T02:11:33.000-07:00
Fix id generation if parent has no input
diff --git a/vendor/assets/javascripts/jquery_nested_form.js b/vendor/assets/javascripts/jquery_nested_form.js
@@ -14,7 +14,13 @@
 
       // Make the context correct by replacing <parents> with the generated ID
       // of each of the parent objects
-      var context = ($(link).closest('.fields').closestChild('input, textarea, select').eq(0).attr('name') || '').replace(new RegExp('\[[a-z_]+\]$'), '');
+      var context = ($(link).closest('.fields').closestChild('input, textarea, select').eq(0).attr('name') || '').replace(/\[[a-z_]+\]$/, '');
+
+      // If the parent has no inputs we need to strip off the last pair
+      var current = content.match(new RegExp('\\[([a-z_]+)\\]\\[new_' + assoc + '\\]'))[1];
+      if (current) {
+        context = context.replace(new RegExp('\\['+current+'\\]\\[(new_)?\\d+\\]$'), '');
+      }
 
       // context will be something like this for a brand new form:
       // project[tasks_attributes][1255929127459][assignments_attributes][1255929128105]
diff --git a/vendor/assets/javascripts/prototype_nested_form.js b/vendor/assets/javascripts/prototype_nested_form.js
@@ -8,7 +8,13 @@ document.observe('click', function(e, el) {
 
     // Make the context correct by replacing <parents> with the generated ID
     // of each of the parent objects
-    var context = (el.getOffsetParent('.fields').firstDescendant().readAttribute('name') || '').replace(new RegExp('\[[a-z_]+\]$'), '');
+    var context = (el.getOffsetParent('.fields').firstDescendant().readAttribute('name') || '').replace(/\[[a-z_]+\]$/, '');
+
+    // If the parent has no inputs we need to strip off the last pair
+    var current = content.match(new RegExp('\\[([a-z_]+)\\]\\[new_' + assoc + '\\]'))[1];
+    if (current) {
+      context = context.replace(new RegExp('\\['+current+'\\]\\[(new_)?\\d+\\]$'), '');
+    }
 
     // context will be something like this for a brand new form:
     // project[tasks_attributes][1255929127459][assignments_attributes][1255929128105]
