Fixed bug caused by non-unique callback function name.

Author: ram8647

runestone/quizly/js/index.html

@@ -90,16 +90,15 @@
    where it can be retrieved by the GCB quiz object.
 */
 function checkAnswer() {
-  console.log("checkAnswer -- RAM");
-  console.log("window.parent.component_factory = " + JSON.stringify(window.parent.component_factory));
-
+  if (DEBUG) console.log("DEBUG index.html/checkAnswer()");
   document.getElementById('show_javascript').disabled = true;
   var result = Blockly.Quizme.evaluateUserAnswer();
   var quizName = Blockly.Quizme.quizName
   var q_result = {"quizname": quizName, "result": result[0], "xml": result[1]}; 
-
+  var fn_name = "quizly_" + quizName;
+  if (DEBUG) console.log("DEBUG checkAnswer fn_name = " + fn_name);
   // Post the result to runestone
-  window.parent.component_factory.quizly(q_result);
+  window.parent.component_factory[fn_name](q_result);
 }
 
 function giveHint() {

runestone/quizly/js/quizly.js

@@ -29,27 +29,31 @@ export default class Quizly extends RunestoneBase {
 	if (DEBUG) console.log("DEBUG: Quizly constructor, opts=" + JSON.stringify(opts));
         this.origElem = orig;
         this.divid = orig.id;
+	if (DEBUG) console.log("DEBUG: Quizly constructor, divid= " + this.divid);
         this.resultsViewer = $(orig).data("results");
-        this.getIFrame();
+        this.getIFrameAndQuizname();
         this.renderQuizly(); //generates HTML
         // Checks localStorage to see if this quizly has already been completed by this user.
 	//        this.checkQuizlyStorage();
         this.caption = "Quizly";
         this.addCaption("runestone");
-	//	if (DEBUG) console.log("DEBUG: Quizly constructor, this=" + JSON.stringify(this));
     }
 
     // The main content of the quizly node is the iframe. 
-    getIFrame() {
+    getIFrameAndQuizname() {
       var html = $(this.origElem).html();
       var p1 = html.search('<iframe');
       var p2 = html.search('</iframe>');
       this.iframe = html.slice(p1,p2+8);
-      if (DEBUG) console.log("DEBUG: getQuestionText() html = " + html);
-      if (DEBUG) console.log("DEBUG: getQuestionText() iframe = " + this.iframe);
+      if (DEBUG) console.log("DEBUG: getIFrame() html = " + html);
+      if (DEBUG) console.log("DEBUG: getIFrame() iframe = " + this.iframe);
+      p1 = html.search('quizname=');
+      p2 = html.search('hints');
+      this.quizname = html.slice(p1+9,p2-5);  // Grab the quizname from iframe
+      if (DEBUG) console.log("DEBUG quizname= ", this.quizname);
     }
 
-    //generates the HTML that the user interacts with
+    // Generates the HTML that the user interacts with
     renderQuizly() {
         var _this = this;
 	if (DEBUG) console.log("DEBUG: renderQuizly()");
@@ -62,21 +66,18 @@ export default class Quizly extends RunestoneBase {
 	if (DEBUG) console.log("DEBUG: renderQuizly(), this = " + JSON.stringify(this));
     }
 
-  // This is what an mchoice event looks like
-  //  logging event {"event":"mChoice","act":"answer:0:correct","answer":"0","correct":"T","div_id":"mc1","course":"quizly","clientLoginStatus":false,"timezoneoffset":4,"percent":1}
-
-  // Called when user clicks submit button
+  // Called from the exercise when user clicks submit button
   // Checks for the result, sets localstorage and submits to the server
-    submitQuizly(result) {
+   submitQuizly(result) {
       if (DEBUG) console.log("DEBUG: submitQuizly result = " + JSON.stringify(result));
       var answer = result["xml"];
       var correct = (result["result"] == true ? "T" : "F");
       var loganswer =  "answer:" + (correct == "T" ? "correct" : "no"); // backward compatible
       var eventInfo = { event: "quizly", act:loganswer, answer:answer, correct:correct, div_id: this.divid };
-      // log the response to the database
+      // Log the response to the database
       this.logBookEvent(eventInfo); // in bookfuncs.js
       if (DEBUG) console.log("DEBUG: submitquizly logbookevent = " + JSON.stringify(eventInfo));
-      // log the fact that the user has attempted this quizly exercise to local storage
+      // Log the fact that the user has attempted this quizly exercise to local storage
       localStorage.setItem(this.divid, "true");
     }
 }
@@ -87,11 +88,11 @@ export default class Quizly extends RunestoneBase {
 =================================*/
  $(document).bind("runestone:login-complete", function () {
      $("[data-component=quizly").each(function (index) {
- 	if (DEBUG) console.log("DEBUG: Quizly rendering");
          try {
 	     var quizly = new Quizly({ orig: this });
              quizlyList[this.id] = quizly;
-	     setupCallback(quizly);
+     	     if (DEBUG) console.log("DEBUG: Quizly rendering, this.id = " + this.id);
+	     setupCallback(quizly, quizly.quizname);
          } catch (err) {
              console.log(`Error rendering Quizly Exercise ${this.id}
                           Details: ${err}`);
@@ -100,16 +101,14 @@ export default class Quizly extends RunestoneBase {
      });
  });
 
-// Sets up a call back function on the window containing the quizly component
-// We need to pass a reference to this quizly object so that it can be use during callback.
-function setupCallback(quizly) {
+// Sets up a unique callback function on the window containing the quizly component
+// The quizly param is a reference to this quizly object so that it can be use during callback.
+// The quizname param is used to construct a unique callback function name
+function setupCallback(quizly, quizname) {
   if (typeof window.component_factory === "undefined") {
       window.component_factory = {};
   }
-  window.component_factory.quizly = function(result) {
-  if (DEBUG) console.log("DEBUG: Quizly component factory = " + JSON.stringify(window.component_factory));
-  if (DEBUG) console.log("DEBUG: Quizly component factory quizly " + JSON.stringify(result));
-  quizly.submitQuizly(result);
-  }
+  var fn_name = "quizly_" + quizname;   // Unique function name
+  window.component_factory[fn_name] = function(result) { quizly.submitQuizly(result); }
 }