Merge branch 'master' of github.com:RunestoneInteractive/RunestoneComponents

Author: bnmnetp

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/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/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/selectquestion/js/selectone.js

@@ -6,8 +6,8 @@
 import {
     renderRunestoneComponent,
     createTimedComponent,
-} from "../../common/js/renderComponent";
-import RunestoneBase from "../../common/js/runestonebase";
+} from "../../common/js/renderComponent.js";
+import RunestoneBase from "../../common/js/runestonebase.js";
 import "../css/selectquestion.css";
 
 export default class SelectOne extends RunestoneBase {
@@ -193,7 +193,7 @@ export default class SelectOne extends RunestoneBase {
             }
             ///////////////////////////
             // just render this component on the page in its usual place
-            res = renderRunestoneComponent(htmlsrc, selectorId, {
+            renderRunestoneComponent(htmlsrc, selectorId, {
                 selector_id: selectorId,
                 useRunestoneServices: true,
             });