From 562f60730fc8af982d28e6738d08d98f1770d7d7 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Sat, 4 Feb 2017 20:15:13 +1100 Subject: [PATCH] Fix bug in handleConfirmMessage override --- modules/system/assets/js/framework.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/system/assets/js/framework.js b/modules/system/assets/js/framework.js index 13e20342a..a352d8c4d 100644 --- a/modules/system/assets/js/framework.js +++ b/modules/system/assets/js/framework.js @@ -294,13 +294,6 @@ if (window.jQuery === undefined) } } - /* - * Initiate request - */ - if (options.confirm && !requestOptions.handleConfirmMessage(options.confirm)) { - return - } - /* * Allow default business logic to be called from user functions */ @@ -310,6 +303,13 @@ if (window.jQuery === undefined) requestOptions = $.extend(requestOptions, options) requestOptions.data = data.join('&') + /* + * Initiate request + */ + if (options.confirm && !requestOptions.handleConfirmMessage(options.confirm)) { + return + } + if (loading) loading.show() $(window).trigger('ajaxBeforeSend', [context]) $el.trigger('ajaxPromise', [context])