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

Author: zihan21206

package-lock.json

@@ -13,7 +13,7 @@
 from .dragndrop import DragNDrop
 from .fitb import FillInTheBlank
 from .groupsub import GroupSubmission
-from .hparsons import HParsonsNode
+from .hparsons import HParsonsDirective
 from .khanex import Khanex
 from .selectquestion import SelectQuestion
 from .matrixeq import MatrixEq
@@ -247,7 +247,7 @@ def build(options):
     "disqus": DisqusDirective,
     "dragndrop": DragNDrop,
     "groupsub": GroupSubmission,
-    "hparsons": HParsonsNode,
+    "hparsons": HParsonsDirective,
     "parsonsprob": ParsonsProblem,
     "poll": Poll,
     "quizly": Quizly,

runestone/__init__.py

@@ -150,6 +150,7 @@ export default class ACFactory {
         });
     }
     static toggleScratchActivecode() {
+        if (!eBookConfig.enableScratchAC) return;
         var divid = "ac_modal_" + eBookConfig.scratchDiv;
         var div = $("#" + divid);
         $(`#${eBookConfig.scratchDiv}`).removeClass("ac_section");

runestone/activecode/js/acfactory.js

@@ -29,6 +29,9 @@
 # of all in-scope data structures after each executed instruction.
 
 
+import json
+import random
+from .pg_encoder import is_class, is_instance, ObjectEncoder, create_lambda_line_number
 import sys
 import bdb  # the KEY import here!
 import re
@@ -45,7 +48,6 @@
 else:
     import StringIO
 
-from .pg_encoder import is_class, is_instance, ObjectEncoder, create_lambda_line_number
 
 # TODO: not threadsafe:
 
@@ -149,16 +151,16 @@ def setJS(jsStr):
 # especially getting setHTML, setCSS, and setJS to work in the imported
 # modules.)
 CUSTOM_MODULE_IMPORTS = (
-    "runestone.codelens.callback_module",
-    "runestone.codelens.ttt_module",
-    "runestone.codelens.html_module",
-    "runestone.codelens.htmlexample_module",
-    # ignore these troublesome imports for now
-    #                         'watch_module',   # 'import sys' might be troublesome
-    #                         'bintree_module',
-    #                         'GChartWrapper',
-    "runestone.codelens.matrix",
-    "runestone.codelens.htmlFrame",
+    # "runestone.codelens.callback_module",
+    # "runestone.codelens.ttt_module",
+    # "runestone.codelens.html_module",
+    # "runestone.codelens.htmlexample_module",
+    # # ignore these troublesome imports for now
+    # #                         'watch_module',   # 'import sys' might be troublesome
+    # #                         'bintree_module',
+    # #                         'GChartWrapper',
+    # "runestone.codelens.matrix",
+    # "runestone.codelens.htmlFrame",
 )
 
 
@@ -218,7 +220,6 @@ def __restricted_import__(*args):
 # Note that this is mad inefficient, but is simple to implement!
 
 # VERY IMPORTANT -- set random seed to 0 to ensure deterministic execution:
-import random
 
 random.seed(0)
 
@@ -398,6 +399,8 @@ def get_user_stdout(frame):
 """
 
 # at_global_scope should be true only if 'frame' represents the global scope
+
+
 def get_user_globals(frame, at_global_scope=False):
     d = filter_var_dict(frame.f_globals)
 
@@ -1506,9 +1509,8 @@ def finalize(self):
         return self.finalizer_func(self.executed_script, self.trace)
 
 
-import json
-
 # the MAIN meaty function!!!
+
 def exec_script_str(script_str, raw_input_lst_json, options_json, finalizer_func):
     options = json.loads(options_json)