Merge branch 'master' into selenium_fixse

Author: bnmnetp

runestone/common/js/runestonebase.js

@@ -140,6 +140,10 @@ export default class RunestoneBase {
     /* Checking/loading from storage */
     async checkServer(eventInfo) {
         // Check if the server has stored answer
+        let self = this;
+        this.checkServerComplete = new Promise(function (resolve, reject) {
+            self.csresolver = resolve;
+        });
         if (this.useRunestoneServices || this.graderactive) {
             let data = {};
             data.div_id = this.divid;
@@ -166,6 +170,7 @@ export default class RunestoneBase {
                     let response = await fetch(request);
                     data = await response.json();
                     this.repopulateFromStorage(data);
+                    this.csresolver("server");
                 } catch (err) {
                     try {
                         this.checkLocalStorage();
@@ -178,6 +183,7 @@ export default class RunestoneBase {
             }
         } else {
             this.checkLocalStorage(); // just go right to local storage
+            this.csresolver("local");
         }
     }
 

runestone/parsons/js/parsons.js

@@ -2059,8 +2059,9 @@ export default class Parsons extends RunestoneBase {
         $(this.messageDiv).hide();
     }
     // Disable the interface
-    disableInteraction() {
+    async disableInteraction() {
         // Disable blocks
+        await this.checkServerComplete;
         if (this.blocks !== undefined) {
             for (var i = 0; i < this.blocks.length; i++) {
                 var block = this.blocks[i];

runestone/timed/js/timed.js

@@ -815,6 +815,7 @@ export default class Timed extends RunestoneBase {
         currentQuestion.checkCurrentAnswer();
         currentQuestion.logCurrentAnswer();
         currentQuestion.renderFeedback();
+        currentQuestion.disableInteraction();
 
         for (var i = 0; i < this.renderedQuestionArray.length; i++) {
             let currentQuestion = this.renderedQuestionArray[i];