Fix: enable scratchAC even on pages with no activecode

Author: bnmnetp

runestone/common/js/renderComponent.js

@@ -6,6 +6,10 @@ export async function renderRunestoneComponent(componentSrc, whereDiv, moreOpts)
      *  The tedious part is calling the right functions to turn the
      *  source into the actual component.
      */
+    if (!componentSrc) {
+        jQuery(`#${whereDiv}`).html(`<p>Sorry, no source is available for preview.</p>`);
+        return;
+    }
     let patt = /..\/_images/g;
     componentSrc = componentSrc.replace(
         patt,
@@ -38,7 +42,7 @@ export async function renderRunestoneComponent(componentSrc, whereDiv, moreOpts)
 
     if (typeof component_factory === "undefined") {
         alert(
-            "Error:  Missing the component factory!  Clear you browser cache."
+            "Error:  Missing the component factory!"
         );
     } else {
         if (

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

@@ -173,7 +173,7 @@
         <!-- <li id="scratch_ac_link"><a href="javascript:ACFactory.toggleScratchActivecode()">Scratch ActiveCode</a></li> -->
 
         <!-- <li class="dropdown">             -->
-          <li id="scratch_ac_link" class="dropdown"><a href="javascript:ACFactory.toggleScratchActivecode()">
+          <li id="scratch_ac_link" class="dropdown"><a href="javascript:runestoneComponents.popupScratchAC()">
               <i class="glyphicon glyphicon-pencil" style="opacity:0.9;"><span aria-label="Scratch Activecode" class="visuallyhidden">Scratch Activecode</span></i></a></li>
         <!-- </li> -->
 
@@ -274,7 +274,6 @@
   eBookConfig.proxyuri_files = '{{proxy_uri_files}}';
   eBookConfig.enable_chatcodes = {{enable_chatcodes}} ? {{ enable_chatcodes }} : false;
 
-
 </script>
 
 <!-- Ad Serving Headers Only serve ads to Anonymous Users -->

webpack.index.js

@@ -114,10 +114,29 @@ export function runestone_auto_import() {
 $(document).ready(runestone_auto_import);
 
 // Provide a function to import one specific Runestone component.
-export function runestone_import(component_name) {
+// the import function inside module_map is async -- runestone_import
+// should be awaited when necessary to ensure the import completes
+export async function runestone_import(component_name) {
     return module_map[component_name]();
 }
 
+async function popupScratchAC() {
+    // load the activecode bundle
+    await runestone_import("activecode");
+    // scratchDiv will be defined if we have already created a scratch
+    // activecode.  If its not defined then we need to get it ready to toggle
+    if (!eBookConfig.scratchDiv) {
+        window.ACFactory.createScratchActivecode();
+        let divid = eBookConfig.scratchDiv
+        window.edList[divid] = ACFactory.createActiveCode($(`#${divid}`)[0],
+            eBookConfig.acDefaultLanguage);
+        if (eBookConfig.isLoggedIn) {
+            window.edList[divid].enableSaveLoad();
+        }
+    }
+    window.ACFactory.toggleScratchActivecode();
+}
+
 // Set the directory containing this script as the `path <https://webpack.js.org/guides/public-path/#on-the-fly>`_ for all webpacked scripts.
 const script_src = document.currentScript.src;
 __webpack_public_path__ = script_src.substring(0, script_src.lastIndexOf('/') + 1);
@@ -131,4 +150,5 @@ rc.runestone_import = runestone_import;
 rc.runestone_auto_import = runestone_auto_import;
 rc.getSwitch = getSwitch;
 rc.switchTheme = switchTheme;
+rc.popupScratchAC = popupScratchAC;
 window.runestoneComponents = rc;