Merge remote-tracking branch 'origin/release-0.5.3'

unepwcmc · Apr 14, 2023 · c541939 · c541939
2 parents 6510ba2 + 150a5b0
commit c541939
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### 0.5.3
+
+**Bug Fix**
+
+* Fix loading spinner never closing, preventing users from accessing the questionnaire
+
 ### 0.5.2 (2020-11-25)
 
 **Hotfix**

diff --git a/app/assets/javascripts/respondent/init.js b/app/assets/javascripts/respondent/init.js
@@ -50,10 +50,13 @@ function ajaxRequestsUnderway() {
       $(this).dialog('open').prev('.ui-dialog-titlebar').hide();
     }
   }).livequery('ajaxComplete', function() {
-    console.log('close');
-    if($('div.no_dialog').length === 0) {
-      $(this).dialog('close');
-    }
+    livequeryThis=this;
+    $(document).ready(function () {
+      console.log('close');
+      if ($('div.no_dialog').length === 0) {
+        $(livequeryThis).dialog('close');
+      } 
+    });
   });
 }
 

diff --git a/app/views/questionnaires/submission.html.erb b/app/views/questionnaires/submission.html.erb
@@ -149,7 +149,6 @@
 <% if @authorization[:translator_visible] %>
   <script type="text/javascript" src="http://www.google.com/jsapi"></script>
   <script type="text/javascript">
-      google.load("language","1");
       var LANGUAGES = {
         "<%=t('languages.arabic')%>" : 'ar',
         "<%=t('languages.chinese')%>" : 'zh',
@@ -158,5 +157,6 @@
         "<%=t('languages.russian')%>" : 'ru',
         "<%=t('languages.spanish')%>" : 'es'
       };
+      google.load("language","1");
     </script>
 <% end %>