Change to using css classes for simple-modal container so it can be embedded within a unique div in the case where we have multiple of these question types on a page.

bnmnetp · bnmnetp · commit 58a9be92d931 · 2013-01-22T14:40:21.000-06:00
diff --git a/v3/css/basic.css b/v3/css/basic.css
@@ -11,15 +11,15 @@
  * Revision: $Id: basic.css 257 2010-07-27 23:06:56Z emartin24 $
  */
 
-#basic-modal-content {display:none;}
+.basic-modal-content {display:none;}
 
 /* Overlay */
 #simplemodal-overlay {background-color:#000; cursor:wait;}
 
 /* Container */
-#simplemodal-container {height:360px; width:600px; color:#bbb; background-color:#333; border:4px solid #444; padding:12px;}
-#simplemodal-container .simplemodal-data {padding:8px;}
-#simplemodal-container code {background:#141414; border-left:3px solid #65B43D; color:#bbb; display:block; font-size:12px; margin-bottom:12px; padding:4px 6px 6px;}
-#simplemodal-container a {color:#ddd;}
-#simplemodal-container a.modalCloseImg {background:url(x.png) no-repeat; width:25px; height:29px; display:inline; z-index:3200; position:absolute; top:-15px; right:-16px; cursor:pointer;}
-#simplemodal-container h3 {color:#84b8d9;}
+.simplemodal-container {height:360px; width:600px; color:#bbb; background-color:#333; border:4px solid #444; padding:12px;}
+.simplemodal-container .simplemodal-data {padding:8px;}
+.simplemodal-container code {background:#141414; border-left:3px solid #65B43D; color:#bbb; display:block; font-size:12px; margin-bottom:12px; padding:4px 6px 6px;}
+.simplemodal-container a {color:#ddd;}
+.simplemodal-container a.modalCloseImg {background:url(x.png) no-repeat; width:25px; height:29px; display:inline; z-index:3200; position:absolute; top:-15px; right:-16px; cursor:pointer;}
+.simplemodal-container h3 {color:#84b8d9;}
diff --git a/v3/embedding-demo.html b/v3/embedding-demo.html
@@ -32,7 +32,8 @@
 
   <!-- This demo shows three visualizations, each embedded within a div ... -->
   <div id="bradsDiv"></div>
-  <div id="basic-modal-content">
+
+  <div id="bradsDiv_modal" class="basic-modal-content">
     Enter the value of the variable a after the current line is executed.
     <input id="basic-textbox" type="textbox" />
     <button onclick="checkMe('basic-textbox','bradsDiv','globals.a')">Check
diff --git a/v3/embedding-demo.js b/v3/embedding-demo.js
diff --git a/v3/js/pytutor.js b/v3/js/pytutor.js
@@ -1120,7 +1120,8 @@ ExecutionVisualizer.prototype.updateOutput = function(smoothTransition) {
   // bnm  Render a question
   if (curEntry.question) {
       //alert(curEntry.question.text);
-      $('#basic-modal-content').modal();
+      
+      $('#'+curEntry.question.div).modal();
   }
 
   // render VCR controls:
@@ -2934,11 +2935,11 @@ function checkMe(inputId, divId, answer) {
    for (j in attrs) {
        correctAns = correctAns[attrs[j]]
    }
-   feedbackElement = $("#basic-modal-content .feedbacktext")
+   feedbackElement = $(".basic-modal-content .feedbacktext")
    if (ans == correctAns) {
        feedbackElement.html('Correct')
    } else {
-       feedbackElement.html('In-Correct')
+       feedbackElement.html('Incorrect')
    }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -1120,7 +1120,8 @@ ExecutionVisualizer.prototype.updateOutput = function(smoothTransition) {`
`1120`	`1120`	`// bnm Render a question`
`1121`	`1121`	`if (curEntry.question) {`
`1122`	`1122`	`//alert(curEntry.question.text);`
`1123`		`- $('#basic-modal-content').modal();`
	`1123`	`+`
	`1124`	`+ $('#'+curEntry.question.div).modal();`
`1124`	`1125`	`}`
`1125`	`1126`
`1126`	`1127`	`// render VCR controls:`
`@@ -2934,11 +2935,11 @@ function checkMe(inputId, divId, answer) {`
`2934`	`2935`	`for (j in attrs) {`
`2935`	`2936`	`correctAns = correctAns[attrs[j]]`
`2936`	`2937`	`}`
`2937`		`- feedbackElement = $("#basic-modal-content .feedbacktext")`
	`2938`	`+ feedbackElement = $(".basic-modal-content .feedbacktext")`
`2938`	`2939`	`if (ans == correctAns) {`
`2939`	`2940`	`feedbackElement.html('Correct')`
`2940`	`2941`	`} else {`
`2941`		`- feedbackElement.html('In-Correct')`
	`2942`	`+ feedbackElement.html('Incorrect')`
`2942`	`2943`	`}`
`2943`	`2944`
`2944`	`2945`	`}`