Merged with upstream repo

Author: ram8647

package-lock.json

@@ -6,18 +6,16 @@
 #
 alabaster==0.7.12
     # via sphinx
-astroid==2.4.2
+astroid==2.5.6
     # via pylint
 attrs==20.3.0
     # via pytest
-babel==2.9.0
+babel==2.9.1
     # via sphinx
 bleach==3.3.0
     # via readme-renderer
 certifi==2020.12.5
     # via requests
-cffi==1.14.4
-    # via cryptography
 chardet==4.0.0
     # via requests
 click==7.1.2
@@ -30,34 +28,34 @@ cogapp==3.0.0
     # via -r requirements.in
 colorama==0.4.4
     # via twine
-cryptography==3.3.1
-    # via secretstorage
 docutils==0.16
     # via
     #   codechat
     #   readme-renderer
     #   sphinx
 easyprocess==0.3
     # via pyvirtualdisplay
+greenlet==1.0.0
+    # via sqlalchemy
 idna==2.10
     # via requests
 imagesize==1.2.0
     # via sphinx
+importlib-metadata==4.0.1
+    # via
+    #   keyring
+    #   twine
 iniconfig==1.1.1
     # via pytest
-isort==5.7.0
+isort==5.8.0
     # via pylint
-jeepney==0.6.0
-    # via
-    #   keyring
-    #   secretstorage
 jinja2==2.11.3
     # via sphinx
-keyring==22.0.1
+keyring==23.0.1
     # via twine
-lazy-object-proxy==1.4.3
+lazy-object-proxy==1.6.0
     # via astroid
-lxml==4.6.2
+lxml==4.6.3
     # via codechat
 markupsafe==1.1.1
     # via jinja2
@@ -72,32 +70,32 @@ paver==1.3.4
     # via
     #   -r requirements.in
     #   sphinxcontrib-paverutils
-pip-tools==5.5.0
+pep517==0.10.0
+    # via pip-tools
+pip-tools==6.1.0
     # via -r requirements-dev.in
 pkginfo==1.7.0
     # via twine
 pluggy==0.13.1
     # via pytest
 py==1.10.0
     # via pytest
-pycparser==2.20
-    # via cffi
-pygments==2.7.4
+pygments==2.8.1
     # via
     #   codechat
     #   readme-renderer
     #   sphinx
-pylint==2.6.0
+pylint==2.8.2
     # via -r requirements-dev.in
 pyparsing==2.4.7
     # via packaging
-pytest==6.2.2
+pytest==6.2.3
     # via -r requirements-dev.in
 pytz==2021.1
     # via babel
-pyvirtualdisplay==2.0
+pyvirtualdisplay==2.1
     # via -r requirements-dev.in
-readme-renderer==28.0
+readme-renderer==29.0
     # via
     #   -r requirements-dev.in
     #   twine
@@ -110,21 +108,17 @@ requests==2.25.1
     #   twine
 rfc3986==1.4.0
     # via twine
-secretstorage==3.3.0
-    # via keyring
 selenium==3.141.0
     # via -r requirements-dev.in
 six==1.15.0
     # via
     #   -r requirements.in
-    #   astroid
     #   bleach
-    #   cryptography
     #   paver
     #   readme-renderer
 snowballstemmer==2.1.0
     # via sphinx
-sphinx==3.4.3
+sphinx==3.5.4
     # via
     #   -r requirements.in
     #   sphinxcontrib-paverutils
@@ -142,17 +136,18 @@ sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.4
     # via sphinx
-sqlalchemy==1.3.23
+sqlalchemy==1.4.12
     # via -r requirements.in
 toml==0.10.2
     # via
+    #   pep517
     #   pylint
     #   pytest
-tqdm==4.56.0
+tqdm==4.60.0
     # via twine
-twine==3.3.0
+twine==3.4.1
     # via -r requirements-dev.in
-urllib3==1.26.3
+urllib3==1.26.4
     # via
     #   requests
     #   selenium
@@ -162,6 +157,8 @@ wheel==0.36.2
     # via -r requirements-dev.in
 wrapt==1.12.1
     # via astroid
+zipp==3.4.1
+    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

requirements-dev.txt

@@ -7,5 +7,5 @@ six>1.12
 Sphinx>=2.0.0
 sphinxcontrib-paverutils>=1.17
 cogapp>=2.5
-SQLAlchemy>=1.0.13
+SQLAlchemy>=1.4.0
 CodeChat>=1.8.6

requirements.in

@@ -6,7 +6,7 @@
 #
 alabaster==0.7.12
     # via sphinx
-babel==2.9.0
+babel==2.9.1
     # via sphinx
 certifi==2020.12.5
     # via requests
@@ -22,13 +22,15 @@ docutils==0.16
     # via
     #   codechat
     #   sphinx
+greenlet==1.0.0
+    # via sqlalchemy
 idna==2.10
     # via requests
 imagesize==1.2.0
     # via sphinx
 jinja2==2.11.3
     # via sphinx
-lxml==4.6.2
+lxml==4.6.3
     # via codechat
 markupsafe==1.1.1
     # via jinja2
@@ -38,7 +40,7 @@ paver==1.3.4
     # via
     #   -r requirements.in
     #   sphinxcontrib-paverutils
-pygments==2.7.4
+pygments==2.8.1
     # via
     #   codechat
     #   sphinx
@@ -54,7 +56,7 @@ six==1.15.0
     #   paver
 snowballstemmer==2.1.0
     # via sphinx
-sphinx==3.4.3
+sphinx==3.5.4
     # via
     #   -r requirements.in
     #   sphinxcontrib-paverutils
@@ -72,9 +74,9 @@ sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.4
     # via sphinx
-sqlalchemy==1.3.23
+sqlalchemy==1.4.12
     # via -r requirements.in
-urllib3==1.26.3
+urllib3==1.26.4
     # via requests
 
 # The following packages are considered to be unsafe in a requirements file:

requirements.txt

@@ -210,7 +210,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/__init__.py

@@ -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/acfactory.js

@@ -8,9 +8,10 @@
 "use strict";
 
 import RunestoneBase from "../../common/js/runestonebase.js";
-import AudioTour from "./audiotour";
-import "./activecode-i18n.en";
-import "./activecode-i18n.pt-br";
+import AudioTour from "./audiotour.js";
+import "./activecode-i18n.en.js";
+import "./activecode-i18n.pt-br.js";
+import "./activecode-i18n.sr-Cyrl.js";
 import CodeMirror from "codemirror";
 import "codemirror/mode/python/python.js";
 import "codemirror/mode/css/css.js";
@@ -20,7 +21,6 @@ import "codemirror/mode/javascript/javascript.js";
 import "codemirror/mode/sql/sql.js";
 import "codemirror/mode/clike/clike.js";
 import "codemirror/mode/octave/octave.js";
-import "./activecode-i18n.en.js";
 import "./../css/activecode.css";
 import "codemirror/lib/codemirror.css";
 
@@ -43,6 +43,7 @@ export class ActiveCode extends RunestoneBase {
         super(opts);
         var suffStart;
         var orig = $(opts.orig).find("textarea")[0];
+        this.containerDiv = opts.orig;
         this.useRunestoneServices = opts.useRunestoneServices;
         this.python3 = opts.python3;
         this.alignVertical = opts.vertical;
@@ -124,28 +125,28 @@ export class ActiveCode extends RunestoneBase {
             1000
         );
         if (this.autorun) {
-            $(document).ready(this.runProg.bind(this));
+            // Simulate pressing the run button, since this will also prevent the user from clicking it until the initial run is complete, and also help the user understand why they're waiting.
+            $(document).ready(this.runButtonHandler.bind(this));
         }
+        this.indicate_component_ready();
     }
 
     createEditor(index) {
-        this.containerDiv = document.createElement("div");
+        this.outerDiv = document.createElement("div");
         var linkdiv = document.createElement("div");
         linkdiv.id = this.divid.replace(/_/g, "-").toLowerCase(); // :ref: changes _ to - so add this as a target
-        $(this.containerDiv).addClass("ac_section alert alert-warning");
+        $(this.outerDiv).addClass("ac_section alert alert-warning");
         var codeDiv = document.createElement("div");
         $(codeDiv).addClass("ac_code_div col-md-12");
         this.codeDiv = codeDiv;
-        this.containerDiv.id = this.divid;
-        this.containerDiv.lang = this.language;
-        this.outerDiv = this.containerDiv;
-        $(this.origElem).replaceWith(this.containerDiv);
+        this.outerDiv.lang = this.language;
+        $(this.origElem).replaceWith(this.outerDiv);
         if (linkdiv.id !== this.divid) {
             // Don't want the 'extra' target if they match.
-            this.containerDiv.appendChild(linkdiv);
+            this.outerDiv.appendChild(linkdiv);
         }
-        this.containerDiv.appendChild(codeDiv);
-        var edmode = this.containerDiv.lang;
+        this.outerDiv.appendChild(codeDiv);
+        var edmode = this.outerDiv.lang;
         if (edmode === "sql") {
             edmode = "text/x-sql";
         } else if (edmode === "java") {
@@ -233,7 +234,9 @@ export class ActiveCode extends RunestoneBase {
         }
     }
 
-    async runButtonHander() {
+    async runButtonHandler() {
+        // Disable the run button until the run is finished.
+        this.runButton.disabled = true;
         try {
             await this.runProg();
         } catch (e) {
@@ -243,6 +246,8 @@ export class ActiveCode extends RunestoneBase {
             this.logCurrentAnswer();
         }
         this.renderFeedback();
+        // The run is finished; re-enable the button.
+        this.runButton.disabled = false;
     }
 
     createControls() {
@@ -257,7 +262,7 @@ export class ActiveCode extends RunestoneBase {
         ctrlDiv.appendChild(butt);
         this.runButton = butt;
         console.log("adding click function for run");
-        this.runButton.onclick = this.runButtonHander.bind(this);
+        this.runButton.onclick = this.runButtonHandler.bind(this);
         $(butt).attr("type", "button");
 
         if (this.enabledownload || eBookConfig.downloadsEnabled) {
@@ -1207,22 +1212,21 @@ Yet another is that there is an internal error.  The internal error message is:
                 let urDivid = `${this.divid}_offscreen_unit_results`;
                 let unitFeedback = document.getElementById(urDivid);
                 let tmp = document.body.removeChild(unitFeedback);
-                if ($(this.containerDiv).find(`#${urDivid}`).length > 0) {
-                    tmp = $(this.containerDiv).find(`#${urDivid}`)[0];
+                if ($(this.outerDiv).find(`#${urDivid}`).length > 0) {
+                    tmp = $(this.outerDiv).find(`#${urDivid}`)[0];
                 } else {
-                    this.containerDiv.appendChild(tmp);
+                    this.outerDiv.appendChild(tmp);
                 }
                 $(tmp).show();
             } else {
                 let urDivid = this.divid + "_unit_results";
                 if (
-                    $(this.containerDiv).find(`#${urDivid}`).length == 0 &&
-                    $(this.containerDiv).find(
-                        `#${urDivid}_offscreen_unit_results`
-                    ).length == 0
+                    $(this.outerDiv).find(`#${urDivid}`).length == 0 &&
+                    $(this.outerDiv).find(`#${urDivid}_offscreen_unit_results`)
+                        .length == 0
                 ) {
                     let urResults = document.getElementById(urDivid);
-                    this.containerDiv.appendChild(urResults);
+                    this.outerDiv.appendChild(urResults);
                 }
             }
         }
@@ -1274,8 +1278,8 @@ Yet another is that there is an internal error.  The internal error message is:
         });
         Sk.divid = this.divid;
         Sk.logResults = logResults;
-        if (this.graderactive && this.containerDiv.closest(".loading")) {
-            Sk.gradeContainer = this.containerDiv.closest(".loading").id;
+        if (this.graderactive && this.outerDiv.closest(".loading")) {
+            Sk.gradeContainer = this.outerDiv.closest(".loading").id;
         } else {
             Sk.gradeContainer = this.divid;
         }

runestone/activecode/js/activecode.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/js/livecode.js

@@ -1,6 +1,6 @@
 /*
 The TimedActivecode classes are a great example of where multiple inheritance would be useful
-But since Javascript does not suppport multiple inheritance we use the mixin pattern.
+But since Javascript does not support multiple inheritance we use the mixin pattern.
 
 */
 import LiveCode from "./livecode";