From cb24d817ad901b0d828ab8f21c176fd93e5c9f26 Mon Sep 17 00:00:00 2001
From: Daniel Ramirez <6914518+drmzio@users.noreply.github.com>
Date: Mon, 25 Mar 2019 09:07:33 -0700
Subject: [PATCH] Fix popup loading indicator sometimes not closing after load
 (#4169)

Fixes #4168. Credit to @drmzio
---
 modules/system/assets/ui/js/popup.js  | 2 +-
 modules/system/assets/ui/storm-min.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/assets/ui/js/popup.js b/modules/system/assets/ui/js/popup.js
index fd0aaf7fd..6d6119edb 100644
--- a/modules/system/assets/ui/js/popup.js
+++ b/modules/system/assets/ui/js/popup.js
@@ -254,7 +254,7 @@
             setTimeout(function(){ self.$backdrop.addClass('loading'); }, 100)
         }
         else {
-            this.$backdrop.removeClass('loading');
+            setTimeout(function(){ self.$backdrop.removeClass('loading'); }, 100)
         }
     }
 
diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js
index 4b6707cfc..e300a8f07 100644
--- a/modules/system/assets/ui/storm-min.js
+++ b/modules/system/assets/ui/storm-min.js
@@ -3808,7 +3808,7 @@ this.$backdrop=null}}
 Popup.prototype.setLoading=function(val){if(!this.$backdrop)
 return;var self=this
 if(val){setTimeout(function(){self.$backdrop.addClass('loading');},100)}
-else{this.$backdrop.removeClass('loading');}}
+else{setTimeout(function(){self.$backdrop.removeClass('loading');},100)}}
 Popup.prototype.setShake=function(){var self=this
 this.$content.addClass('popup-shaking')
 setTimeout(function(){self.$content.removeClass('popup-shaking')},1000)}