From beab3c3ded56289d27468e94eb3740303a7143f2 Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Sun, 28 Sep 2014 12:23:18 +1000
Subject: [PATCH] A defined loader should not hide when there is a redirect
 taking place

---
 modules/system/assets/js/framework.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/system/assets/js/framework.js b/modules/system/assets/js/framework.js
index 0e655a601..781241d31 100644
--- a/modules/system/assets/js/framework.js
+++ b/modules/system/assets/js/framework.js
@@ -252,14 +252,19 @@ if (window.jQuery === undefined)
         $el.trigger('ajaxPromise')
         return $.ajax(requestOptions)
             .fail(function(jqXHR, textStatus, errorThrown){
-                if (!isRedirect) $el.trigger('ajaxFail', [context, textStatus, jqXHR])
+                if (!isRedirect) {
+                    $el.trigger('ajaxFail', [context, textStatus, jqXHR])
+                    if (loading) loading.hide()
+                }
             })
             .done(function(data, textStatus, jqXHR){
-                if (!isRedirect) $el.trigger('ajaxDone', [context, data, textStatus, jqXHR])
+                if (!isRedirect) {
+                    $el.trigger('ajaxDone', [context, data, textStatus, jqXHR])
+                    if (loading) loading.hide()
+                }
             })
             .always(function(dataOrXhr, textStatus, xhrOrError){
                 $el.trigger('ajaxAlways', [context, dataOrXhr, textStatus, xhrOrError])
-                if (loading) loading.hide()
             })
     }