From 1c6d48ffa88fb1e7557978c9ef93b75fc0d88074 Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Mon, 27 Oct 2014 17:59:53 +1100
Subject: [PATCH] Fixes a strange issue where a <button> inside a nested <form>
 will trigger the event twice (1 for button, 1 for form)

---
 .../backend/assets/js/october.stripeloadindicator.js  | 11 ++++++++---
 modules/system/assets/js/framework.extras.js          | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/modules/backend/assets/js/october.stripeloadindicator.js b/modules/backend/assets/js/october.stripeloadindicator.js
index ec91a9e9c..f41a74a23 100644
--- a/modules/backend/assets/js/october.stripeloadindicator.js
+++ b/modules/backend/assets/js/october.stripeloadindicator.js
@@ -57,17 +57,22 @@
     // ==============
 
     $(document)
-        .on('ajaxPromise', '[data-stripe-load-indicator]', function() {
+        .on('ajaxPromise', '[data-stripe-load-indicator]', function(event) {
+            // Prevent this event from bubbling up to a non-related data-request
+            // element, for example a <form> tag wrapping a <button> tag
+            event.stopPropagation()
+
             $.oc.stripeLoadIndicator.show()
 
             // This code will cover instances where the element has been removed
             // from the DOM, making the resolution event below an orphan.
-            var $el = $(this);
+            var $el = $(this)
             $(window).one('ajaxUpdateComplete', function(){
                 if ($el.closest('html').length === 0)
                     $.oc.stripeLoadIndicator.hide()
              })
-        }).on('ajaxFail ajaxDone', '[data-stripe-load-indicator]', function() {
+        }).on('ajaxFail ajaxDone', '[data-stripe-load-indicator]', function(event) {
+            event.stopPropagation()
             $.oc.stripeLoadIndicator.hide()
         })
 
diff --git a/modules/system/assets/js/framework.extras.js b/modules/system/assets/js/framework.extras.js
index 68a886896..35ec88167 100644
--- a/modules/system/assets/js/framework.extras.js
+++ b/modules/system/assets/js/framework.extras.js
@@ -65,17 +65,22 @@
     // ==============
 
     $(document)
-        .on('ajaxPromise', '[data-request]', function() {
+        .on('ajaxPromise', '[data-request]', function(event) {
+            // Prevent this event from bubbling up to a non-related data-request
+            // element, for example a <form> tag wrapping a <button> tag
+            event.stopPropagation()
+
             $.oc.stripeLoadIndicator.show()
 
             // This code will cover instances where the element has been removed
             // from the DOM, making the resolution event below an orphan.
-            var $el = $(this);
+            var $el = $(this)
             $(window).one('ajaxUpdateComplete', function(){
                 if ($el.closest('html').length === 0)
                     $.oc.stripeLoadIndicator.hide()
              })
-        }).on('ajaxFail ajaxDone', '[data-request]', function() {
+        }).on('ajaxFail ajaxDone', '[data-request]', function(event) {
+            event.stopPropagation()
             $.oc.stripeLoadIndicator.hide()
         })