Merge branch 'master' of https://github.com/vqum/RunestoneComponents into master

Author: vqum

runestone/__init__.py

@@ -208,7 +208,6 @@ def build(options):
     "presenter_mode.css",
     "jquery-ui-1.10.3.custom.min.css",
     "bootstrap-sphinx.css",
-    "user-highlights.css",
     "runestone-custom-sphinx-bootstrap.css?v=" + runestone_version,
     "theme-overrides.css",
 ]

runestone/activecode/js/acfactory.js

@@ -160,9 +160,9 @@ export default class ACFactory {
 // Page Initialization
 //
 
-$(document).ready(function () {
+$(document).bind("runestone:login-complete", function () {
     ACFactory.createScratchActivecode();
-    $("[data-component=activecode]").each(function (index) {
+    $("[data-component=activecode]").each(function () {
         if ($(this).closest("[data-component=timedAssessment]").length == 0) {
             // If this element exists within a timed component, don't render it here
             try {

runestone/activecode/js/livecode.js

@@ -1,6 +1,7 @@
 import { ActiveCode } from "./activecode.js";
 import MD5 from "./md5.js";
 import JUnitTestParser from "./extractUnitResults.js";
+import "../../codelens/js/pytutor-embed.bundle.js";
 
 export default class LiveCode extends ActiveCode {
     constructor(opts) {

runestone/activecode/test/test_activecode.py

@@ -13,7 +13,7 @@ def find_ac(selenium_utils, div_id):
 
 def click_run(selenium_utils, ac_selenium_element):
     # The run button can sometimes be scrolled to the top of the screen, where it's hidden by the navigation bar. In this case, we can't click it, since Selenium will complain ``Message: element click intercepted: Element <button class="btn btn-success run-button" type="button">...</button> is not clickable at point (460, 17). Other element would receive the click: <div class="navbar-collapse collapse navbar-ex1-collapse">...</div>``. To avoid this, always scroll to the top of the document, guaranteeing that the navbar won't be hiding the run button.
-    selenium_utils.driver.execute_script("window.scrollTo(0, 0);")
+    selenium_utils.scroll_to_top()
     rb = ac_selenium_element.find_element_by_class_name("run-button")
     rb.click()
     # After clicking run, the browser may need some time to load and execute the code. Wait until the run button becomes clickable, indicating the code has finished running.

runestone/codelens/js/codelens.js

@@ -11,6 +11,8 @@
  return the buttons, but I'm having a hard time thinking of any other use for that besides mine.
  */
 
+import RunestoneBase from "../../common/js/runestonebase.js";
+import "./pytutor-embed.bundle.js";
 import "./../css/pytutor.css";
 
 function attachLoggers(codelens, divid) {

runestone/codelens/visualizer.py

@@ -29,8 +29,6 @@
 def setup(app):
     app.add_directive("codelens", Codelens)
 
-    app.add_autoversioned_javascript("pytutor-embed.bundle.js")
-
     app.add_config_value("codelens_div_class", "alert alert-warning cd_section", "html")
     app.add_config_value("trace_url", "http://tracer.runestone.academy:5000", "html")
     app.add_node(CodeLensNode, html=(visit_codelens_node, depart_codelens_node))
@@ -40,7 +38,7 @@ def setup(app):
 
 VIS = """
 <div class="runestone" style="max-width: none;">
-    <div class="%(divclass)s" data-question_label="%(question_label)s">
+    <div class="%(divclass)s" data-component="codelens" data-question_label="%(question_label)s">
         <div class="pytutorVisualizer" id="%(divid)s"
            data-params='{"embeddedMode": true, "lang": "%(language)s", "jumpToEnd": false}'>
         </div>

runestone/common/js/renderComponent.js

@@ -1,5 +1,3 @@
-import TimedMC from "../../mchoice/js/timedmc";
-
 export function renderRunestoneComponent(componentSrc, whereDiv, moreOpts) {
     /**
      *  The easy part is adding the componentSrc to the existing div.

runestone/common/js/user-highlights.js

@@ -2,12 +2,8 @@
 
 "use strict";
 
-import RunestoneBase from "./runestonebase";
 import "../css/user-highlights.css";
 
-var urlList;
-var extendType;
-var rsb = new RunestoneBase();
 
 function getCompletions() {
     // Get the completion status

runestone/datafile/js/datafile.js

@@ -40,26 +40,27 @@ class DataFile extends RunestoneBase {
                 this.createPre();
             }
         }
+        this.indicate_component_ready();
     }
     /*=====================================
     == Create either <pre> or <textarea> ==
     ==  depending on if editing is true  ==
     ==================================*/
     createPre() {
-        this.preContainer = document.createElement("pre");
-        this.preContainer.id = this.divid;
-        $(this.preContainer).attr({ style: "display: " + this.displayClass });
-        this.preContainer.innerHTML = this.origElem.innerHTML;
-        $(this.origElem).replaceWith(this.preContainer);
+        this.containerDiv = document.createElement("pre");
+        this.containerDiv.id = this.divid;
+        $(this.containerDiv).attr({ style: "display: " + this.displayClass });
+        this.containerDiv.innerHTML = this.origElem.innerHTML;
+        $(this.origElem).replaceWith(this.containerDiv);
     }
     createTextArea() {
-        this.textAreaContainer = document.createElement("textarea");
-        this.textAreaContainer.id = this.divid;
-        this.textAreaContainer.rows = this.numberOfRows;
-        this.textAreaContainer.cols = this.numberOfCols;
-        this.textAreaContainer.innerHTML = this.origElem.innerHTML;
-        $(this.textAreaContainer).addClass("datafiletextfield");
-        $(this.origElem).replaceWith(this.textAreaContainer);
+        this.containerDiv = document.createElement("textarea");
+        this.containerDiv.id = this.divid;
+        this.containerDiv.rows = this.numberOfRows;
+        this.containerDiv.cols = this.numberOfCols;
+        this.containerDiv.innerHTML = this.origElem.innerHTML;
+        $(this.containerDiv).addClass("datafiletextfield");
+        $(this.origElem).replaceWith(this.containerDiv);
     }
 }
 

runestone/fitb/fitb.py

@@ -144,7 +144,6 @@ class FillInTheBlank(RunestoneIdDirective):
     option_spec = RunestoneIdDirective.option_spec.copy()
     option_spec.update(
         {
-            "blankid": directives.unchanged,
             "casei": directives.flag,  # case insensitive matching
         }
     )