From f8821f692ff370ef4ac6e0424a1ff049087cae2d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 7 Oct 2015 09:32:22 +0000 Subject: [PATCH] fix an other case were spinner is not removed due to a client-side javascript error --- phpgwapi/js/framework/fw_browser.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpgwapi/js/framework/fw_browser.js b/phpgwapi/js/framework/fw_browser.js index 015240bc37..d4faab33c8 100644 --- a/phpgwapi/js/framework/fw_browser.js +++ b/phpgwapi/js/framework/fw_browser.js @@ -155,15 +155,15 @@ var fw_browser = Class.extend({ var self = this; this.ajaxLoaderDiv = jQuery('
'+egw.lang('please wait...')+'
').insertBefore(this.baseDiv); this.loadingDeferred = new jQuery.Deferred(); - + // Try to escape from infinitive not resolved loadingDeferred // At least user can close the broken tab and work with the others. // Define a escape timeout for 5 sec this.ajaxLoaderDivTimeout = setTimeout(function(){ - self.ajaxLoaderDiv.hide().remove(); + (self.ajaxLoaderDiv || jQuery('div.loading')).hide().remove(); self.ajaxLoaderDiv = null; },5000); - + this.loadingDeferred.always(function() { if(self.ajaxLoaderDiv) { @@ -173,7 +173,7 @@ var fw_browser = Class.extend({ clearTimeout(self.ajaxLoaderDivTimeout); } }); - + // Check whether the given url is a pseudo url which should be executed // by calling the ajax_exec function // we now send whole url back to server, so apps can use $_GET['ajax']==='true'