argh-js-scoping.patch

diff --git a/core/modules/edit/js/util.js b/core/modules/edit/js/util.js
index 3f2919e..02ad49e 100644
--- a/core/modules/edit/js/util.js
+++ b/core/modules/edit/js/util.js
@@ -62,13 +62,17 @@ Drupal.edit.util.form = {
       url: Drupal.edit.util.buildUrl(fieldID, drupalSettings.edit.fieldFormURL),
       event: 'edit-internal.edit',
       submit: { nocssjs : options.nocssjs, reset : options.reset },
-      progress: { type : null } // No progress indicator.
+      progress: { type : null }, // No progress indicator.
+      custom: {
+        fieldID: fieldID,
+        callback: callback
+      }
     });
     // Implement a scoped editFieldForm AJAX command: calls the callback.
     Drupal.ajax[fieldID].commands.editFieldForm = function (ajax, response, status) {
-      callback(response.data, ajax);
+      ajax.custom.callback(response.data, ajax);
       // Delete the Drupal.ajax instance that called this very function.
-      delete Drupal.ajax[fieldID];
+      delete Drupal.ajax[ajax.custom.fieldID];
       $el.off('edit-internal.edit');
     };
     // This will ensure our scoped editFieldForm AJAX command gets called.