Merge branch 'RunestoneInteractive:master' into master

Author: zihan21206

pyproject.toml

@@ -34,7 +34,7 @@ license = "GPL"
 name = "runestone"
 readme = "README.rst"
 repository = "https://github.com/RunestoneInteractive/RunestoneComponents"
-version = "6.3.20"
+version = "6.3.23"
 
 # See https://python-poetry.org/docs/pyproject/#include-and-exclude.
 include = [

runestone/activecode/js/activecode.js

@@ -304,6 +304,9 @@ export default class SQLActiveCode extends ActiveCode {
             result += "\n";
         }
         let pct = (100 * this.passed) / (this.passed + this.failed);
+        if (isNaN(pct)) {
+            pct = 0.0;
+        }
         pct = pct.toLocaleString(undefined, { maximumFractionDigits: 2 });
         result += `You passed ${this.passed} out of ${
             this.passed + this.failed
@@ -319,6 +322,7 @@ export default class SQLActiveCode extends ActiveCode {
             actual = result_table.values[row][col];
         } catch (e) {
             output = `Failed Not enough data to check row ${row} or column ${col}`;
+            this.failed++;
             return output;
         }
         const operators = {

runestone/activecode/js/activecode_sql.js

@@ -46,6 +46,9 @@ export default class ClickableArea extends RunestoneBase {
         this.caption = "Clickable";
         this.addCaption("runestone");
         this.checkServer("clickableArea", true);
+        if (typeof Prism !== "undefined") {
+            Prism.highlightAllUnder(this.containerDiv);
+        }
     }
     /*===========================
     == Update basic attributes ==

runestone/clickableArea/js/clickable.js

@@ -157,16 +157,16 @@ export default class RunestoneBase {
                 throw new Error(`Failed to save the log entry
                     Status: ${response.status}`);
             }
-            post_return = response.json();
+            post_return = await response.json();
         } catch (e) {
             let detail = "none";
-            if (post_return.detail) {
+            if (post_return && post_return.detail) {
                 detail = post_return.detail;
             }
             if (eBookConfig.loginRequired) {
-                alert(`Error: Your action was not saved! 
-                    The error was ${e} 
-                    Detail: ${detail}. 
+                alert(`Error: Your action was not saved!
+                    The error was ${e}
+                    Detail: ${detail}.
                     Please report this error!`);
             }
             // send a request to save this error
@@ -449,7 +449,7 @@ export default class RunestoneBase {
             // See - https://docs.mathjax.org/en/latest/advanced/typeset.html
             // Per the above we should keep track of the promises and only call this
             // a second time if all previous promises have resolved.
-            MathJax.typesetPromise([component]);
+            return MathJax.typesetPromise([component]);
         }
     }
 }

runestone/common/js/runestonebase.js

@@ -341,7 +341,7 @@ <h4>Before you keep reading...</h4>
   {% if dynamic_pages == 'True' %}
     {% raw %}
       {% if show_ethical_ad  %}
-      <div data-ea-publisher="runestoneacademy" data-ea-type="text"></div>
+      <div data-ea-publisher="runestoneacademy" data-ea-type="image" data-ea-style="stickybox"></div>
       {% endif %}
     {% endraw %}
   {% endif %}

runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html

@@ -27,6 +27,7 @@
     RunestoneIdDirective,
     RunestoneIdNode,
 )
+import pdb
 
 
 def setup(app):
@@ -38,7 +39,7 @@ def setup(app):
     app.connect("env-purge-doc", purge_datafiles)
 
 
-TEMPLATE = u"""
+TEMPLATE = """
 <div class="runestone datafile %(optclass)s">
 <div class="datafile_caption">Data file: <code>%(divid)s</code></div>
 <pre data-component="datafile" id=%(divid)s %(hidden)s data-edit="%(edit)s" data-rows="%(rows)s" data-cols="%(cols)s">
@@ -55,6 +56,7 @@ def setup(app):
 class DataFileNode(nodes.General, nodes.Element, RunestoneIdNode):
     pass
 
+
 # self for these functions is an instance of the writer class.  For example
 # in html, self is sphinx.writers.html.SmartyPantsHTMLTranslator
 # The node that is passed as a parameter is an instance of our node class.
@@ -74,9 +76,9 @@ def visit_df_html(self, node):
 
 
 def depart_df_html(self, node):
-    """ This is called at the start of processing an datafile node.  If datafile had recursive nodes
-        etc and did not want to do all of the processing in visit_ac_html any finishing touches could be
-        added here.
+    """This is called at the start of processing an datafile node.  If datafile had recursive nodes
+    etc and did not want to do all of the processing in visit_ac_html any finishing touches could be
+    added here.
     """
     pass
 
@@ -91,14 +93,14 @@ def purge_datafiles(app, env, docname):
 
 class DataFile(RunestoneIdDirective):
     """
-.. datafile:: identifier
-   :edit: Option that makes the datafile editable
-   :cols: If editable, number of columns--default is 20
-   :rows: If editable, number of rows--default is 40
-   :hide: Flag that sets a non-editable datafile to be hidden
-   :image: Flag that says this file is an image implies :fromfile: will be used
-   :fromfile: path to file that contains the data
-   """
+    .. datafile:: identifier
+       :edit: Option that makes the datafile editable
+       :cols: If editable, number of columns--default is 20
+       :rows: If editable, number of rows--default is 40
+       :hide: Flag that sets a non-editable datafile to be hidden
+       :image: Flag that says this file is an image implies :fromfile: will be used
+       :fromfile: path to file that contains the data
+    """
 
     required_arguments = 1
     optional_arguments = 0
@@ -117,16 +119,16 @@ class DataFile(RunestoneIdDirective):
 
     def run(self):
         """
-            process the multiplechoice directive and generate html for output.
-            :param self:
-            :return:
-            .. datafile:: identifier
-                :edit: Option that makes the datafile editable
-                :cols: If editable, number of columns--default is 20
-                :rows: If editable, number of rows--default is 40
-                :hide: Flag that sets a non-editable datafile to be hidden
-                :image:
-                :fromfile: path to file that contains the data
+        process the multiplechoice directive and generate html for output.
+        :param self:
+        :return:
+        .. datafile:: identifier
+            :edit: Option that makes the datafile editable
+            :cols: If editable, number of columns--default is 20
+            :rows: If editable, number of rows--default is 40
+            :hide: Flag that sets a non-editable datafile to be hidden
+            :image:
+            :fromfile: path to file that contains the data
         """
         super(DataFile, self).run()
         env = self.state.document.settings.env

runestone/datafile/__init__.py

@@ -38,6 +38,9 @@ export default class DragNDrop extends RunestoneBase {
         this.createNewElements();
         this.caption = "Drag-N-Drop";
         this.addCaption("runestone");
+        if (typeof Prism !== "undefined") {
+            Prism.highlightAllUnder(this.containerDiv);
+        }
     }
     /*======================
     === Update variables ===
@@ -104,7 +107,6 @@ export default class DragNDrop extends RunestoneBase {
         if (typeof runestoneMathready !== "undefined") {
             runestoneMathReady.then(() => self.queueMathJax(self.containerDiv));
         }
-
     }
     finishSettingUp() {
         this.appendReplacementSpans();

runestone/dragndrop/js/dragndrop.js

@@ -30,6 +30,9 @@ export default class FITB extends RunestoneBase {
         this.caption = "Fill in the Blank";
         this.addCaption("runestone");
         this.checkServer("fillb", true);
+        if (typeof Prism !== "undefined") {
+            Prism.highlightAllUnder(this.containerDiv);
+        }
     }
     // Find the script tag containing JSON in a given root DOM node.
     scriptSelector(root_node) {

runestone/fitb/js/fitb.js

@@ -56,6 +56,9 @@ export default class MultipleChoice extends RunestoneBase {
         if (typeof runestoneMathready !== "undefined") {
             runestoneMathReady.then(() => self.queueMathJax(self.containerDiv));
         }
+        if (typeof Prism !== "undefined") {
+            Prism.highlightAllUnder(this.containerDiv);
+        }
     }
 
     /*====================================