From 55fc58926bbdd835bca54ea945e7cba4805ded52 Mon Sep 17 00:00:00 2001
From: Darren Oh <darrenoh@30772.no-reply.drupal.org>
Date: Mon, 19 Feb 2018 11:09:56 -0500
Subject: [PATCH] Issue #2662932 by droplet: Fix file upload progress bar

---
 core/modules/file/file.es6.js | 3 ++-
 core/modules/file/file.js     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/modules/file/file.es6.js b/core/modules/file/file.es6.js
index 9ab5dc2da3..52eabfeb79 100644
--- a/core/modules/file/file.es6.js
+++ b/core/modules/file/file.es6.js
@@ -167,6 +167,7 @@
      *   The event triggered. For example `change.autoFileUpload`.
      */
     triggerUploadButton(event) {
+      Drupal.file.progressBar(event);
       $(event.target).closest('.js-form-managed-file').find('.js-form-submit').trigger('mousedown');
     },
 
@@ -217,7 +218,7 @@
      *   The event triggered, most likely a `mousedown` event.
      */
     progressBar(event) {
-      const $clickedButton = $(this);
+      const $clickedButton = $(event.target).closest('.js-form-managed-file').find('.js-form-submit');
       const $progressId = $clickedButton.closest('div.js-form-managed-file').find('input.file-progress');
       if ($progressId.length) {
         const originalName = $progressId.attr('name');
diff --git a/core/modules/file/file.js b/core/modules/file/file.js
index 4d51bb0fa0..04c805b8c0 100644
--- a/core/modules/file/file.js
+++ b/core/modules/file/file.js
@@ -90,6 +90,7 @@
       }
     },
     triggerUploadButton: function triggerUploadButton(event) {
+      Drupal.file.progressBar(event);
       $(event.target).closest('.js-form-managed-file').find('.js-form-submit').trigger('mousedown');
     },
     disableFields: function disableFields(event) {
@@ -111,7 +112,7 @@
       }, 1000);
     },
     progressBar: function progressBar(event) {
-      var $clickedButton = $(this);
+      var $clickedButton = $(event.target).closest('.js-form-managed-file').find('.js-form-submit');
       var $progressId = $clickedButton.closest('div.js-form-managed-file').find('input.file-progress');
       if ($progressId.length) {
         var originalName = $progressId.attr('name');
-- 
2.14.3 (Apple Git-98)