Merge pull request #227 from flysaiah/timedFixes

Timed fixes

Author: bnmnetp

runestone/activecode/js/timed_activecode.js

@@ -51,6 +51,7 @@ TimedActiveCode.prototype.processTimedSubmission = function (logFlag) {
     if (this.useRunestoneServices) {
         if (logFlag) {
             this.saveEditor();
+            this.runProg();
         } else {
             this.loadEditor().done(this.runProg.bind(this));
         }

runestone/assess/js/mchoice.js

@@ -279,6 +279,10 @@ MultipleChoice.prototype.randomizeAnswers = function () {
 
 MultipleChoice.prototype.restoreAnswers = function (data) {
     // Restore answers from storage retrieval done in RunestoneBase
+    // sometimes data.answer can be null
+    if (!data.answer) {
+        data.answer = "";
+    }
     var answers = data.answer.split(",");
     for (var a = 0; a < answers.length; a++) {
         var index = answers[a];

runestone/dragndrop/js/dragndrop.js

@@ -244,10 +244,12 @@ DragNDrop.prototype.setEventListeners = function (dgSpan, dpSpan) {
     }.bind(this));
 };
 DragNDrop.prototype.renderFeedbackDiv = function () {
-    this.feedBackDiv = document.createElement("div");
-    this.feedBackDiv.id = this.divid + "_feedback";
-    this.containerDiv.appendChild(document.createElement("br"));
-    this.containerDiv.appendChild(this.feedBackDiv);
+    if (!this.feedBackDiv) {
+        this.feedBackDiv = document.createElement("div");
+        this.feedBackDiv.id = this.divid + "_feedback";
+        this.containerDiv.appendChild(document.createElement("br"));
+        this.containerDiv.appendChild(this.feedBackDiv);
+    }
 };
 /*=======================
 == Auxiliary functions ==
@@ -342,6 +344,9 @@ DragNDrop.prototype.dragEval = function (logFlag) {
 };
 
 DragNDrop.prototype.renderFeedback = function () {
+    if (!this.feedBackDiv) {
+        this.renderFeedbackDiv();
+    }
     this.feedBackDiv.style.display = "block";
     if (this.correct) {
         $(this.feedBackDiv).html("You are correct!");