X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Ffile%2Ffile.js;h=79aa8288c07810e26c3afb36dcf6bd4104164b49;hb=5b8bb166bfa98770daef9de5c127fc2e6ef02340;hp=4d51bb0fa01e57a4af47f267f5167b75f2ccb214;hpb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;p=yaffs-website

diff --git a/web/core/modules/file/file.js b/web/core/modules/file/file.js
index 4d51bb0fa..79aa8288c 100644
--- a/web/core/modules/file/file.js
+++ b/web/core/modules/file/file.js
@@ -39,7 +39,7 @@
     attach: function attach(context) {
       $(context).find('input[type="file"]').once('auto-file-upload').on('change.autoFileUpload', Drupal.file.triggerUploadButton);
     },
-    detach: function detach(context, setting, trigger) {
+    detach: function detach(context, settings, trigger) {
       if (trigger === 'unload') {
         $(context).find('input[type="file"]').removeOnce('auto-file-upload').off('.autoFileUpload');
       }
@@ -52,10 +52,12 @@
       $context.find('.js-form-submit').on('mousedown', Drupal.file.disableFields);
       $context.find('.js-form-managed-file .js-form-submit').on('mousedown', Drupal.file.progressBar);
     },
-    detach: function detach(context) {
-      var $context = $(context);
-      $context.find('.js-form-submit').off('mousedown', Drupal.file.disableFields);
-      $context.find('.js-form-managed-file .js-form-submit').off('mousedown', Drupal.file.progressBar);
+    detach: function detach(context, settings, trigger) {
+      if (trigger === 'unload') {
+        var $context = $(context);
+        $context.find('.js-form-submit').off('mousedown', Drupal.file.disableFields);
+        $context.find('.js-form-managed-file .js-form-submit').off('mousedown', Drupal.file.progressBar);
+      }
     }
   };
 
@@ -93,11 +95,8 @@
       $(event.target).closest('.js-form-managed-file').find('.js-form-submit').trigger('mousedown');
     },
     disableFields: function disableFields(event) {
-      var $clickedButton = $(this).findOnce('ajax');
-
-      if (!$clickedButton.length) {
-        return;
-      }
+      var $clickedButton = $(this);
+      $clickedButton.trigger('formUpdated');
 
       var $enabledFields = [];
       if ($clickedButton.closest('div.js-form-managed-file').length > 0) {
@@ -126,6 +125,7 @@
       setTimeout(function () {
         $clickedButton.closest('div.js-form-managed-file').find('div.ajax-progress-bar').slideDown();
       }, 500);
+      $clickedButton.trigger('fileUpload');
     },
     openInNewWindow: function openInNewWindow(event) {
       event.preventDefault();