TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes a strange issue where a <button> inside a nested <form> will trigger the event twice (1 for button, 1 for form)

This commit is contained in:
Sam Georges 2014-10-27 17:59:53 +11:00
parent a00cb9f556
commit 1c6d48ffa8
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/backend/assets/js/october.stripeloadindicator.js
View File

@ -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()
})

11
modules/system/assets/js/framework.extras.js
View File

@ -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()
})