Merge branch 'bookserver' of github.com:RunestoneInteractive/RunestoneComponents into bookserver

Author: runestonetest

runestone/activecode/js/activecode.js

@@ -554,6 +554,8 @@ export class ActiveCode extends RunestoneBase {
         $(this.runButton).text($.i18n("msg_activecode_save_run"));
     }
 
+    // _`addHistoryScrubber`
+    // ---------------------
     // Activecode -- If the code has not changed wrt the scrubber position value then don't save the code or reposition the scrubber
     //  -- still call runlog, but add a parameter to not save the code
     // add an initial load history button

runestone/common/js/user-highlights.js

@@ -43,10 +43,10 @@ function getCompletions() {
                 }
                 $("#main-content").append(
                     '<div style="text-align:center"><button class="btn btn-lg ' +
-                        completionClass +
-                        '" id="completionButton">' +
-                        completionMsg +
-                        "</button></div>"
+                    completionClass +
+                    '" id="completionButton">' +
+                    completionMsg +
+                    "</button></div>"
                 );
             }
         });
@@ -57,8 +57,8 @@ function showLastPositionBanner() {
     if (typeof lastPositionVal !== "undefined") {
         $("body").append(
             '<img src="../_static/last-point.png" style="position:absolute; padding-top:55px; left: 10px; top: ' +
-                parseInt(lastPositionVal) +
-                'px;"/>'
+            parseInt(lastPositionVal) +
+            'px;"/>'
         );
         $("html, body").animate({ scrollTop: parseInt(lastPositionVal) }, 1000);
     }
@@ -158,6 +158,8 @@ function addNavigationAndCompletionButtons() {
     });
 }
 
+// _ decorateTableOfContents
+// -------------------------
 function decorateTableOfContents() {
     if (
         window.location.href.toLowerCase().indexOf("toc.html") != -1 ||
@@ -183,8 +185,8 @@ function decorateTableOfContents() {
                                     .addClass("completed")
                                     .append(
                                         '<span class="infoTextCompleted">- Completed this topic on ' +
-                                            item.endDate +
-                                            "</span>"
+                                        item.endDate +
+                                        "</span>"
                                     )
                                     .children()
                                     .first()
@@ -205,8 +207,8 @@ function decorateTableOfContents() {
                                     .addClass("active")
                                     .append(
                                         '<span class="infoTextActive">Last read this topic on ' +
-                                            item.endDate +
-                                            "</span>"
+                                        item.endDate +
+                                        "</span>"
                                     )
                                     .children()
                                     .first()
@@ -229,7 +231,7 @@ function decorateTableOfContents() {
             }
         });
         var data = { course: eBookConfig.course };
-        jQuery.get(eBookConfig.ajaxURL + "getlastpage", data, function (data) {
+        jQuery.get("/logger/getlastpage", data, function (data) {
             var lastPageData;
             if (data != "None") {
                 lastPageData = $.parseJSON(data);
@@ -238,16 +240,16 @@ function decorateTableOfContents() {
                         .show()
                         .html(
                             '<div id="jump-to-chapter" class="alert alert-info" ><strong>You were Last Reading:</strong> ' +
-                                lastPageData[0].lastPageChapter +
-                                (lastPageData[0].lastPageSubchapter
-                                    ? " &gt; " +
-                                      lastPageData[0].lastPageSubchapter
-                                    : "") +
-                                ' <a href="' +
-                                lastPageData[0].lastPageUrl +
-                                "?lastPosition=" +
-                                lastPageData[0].lastPageScrollLocation +
-                                '">Continue Reading</a></div>'
+                            lastPageData[0].lastPageChapter +
+                            (lastPageData[0].lastPageSubchapter
+                                ? " &gt; " +
+                                lastPageData[0].lastPageSubchapter
+                                : "") +
+                            ' <a href="' +
+                            lastPageData[0].lastPageUrl +
+                            "?lastPosition=" +
+                            lastPageData[0].lastPageScrollLocation +
+                            '">Continue Reading</a></div>'
                         );
                 }
             }

webpack.index.js

@@ -38,6 +38,7 @@ import "./runestone/common/project_template/_templates/plugin_layouts/sphinx_boo
 import "./runestone/common/css/runestone-custom-sphinx-bootstrap.css";
 
 // Misc
+import "./runestone/common/js/bookfuncs.js";
 import "./runestone/common/js/user-highlights.js";
 
 // These belong in dynamic imports for the obvious component; however, these components don't include a ``data-component`` attribute.
@@ -95,7 +96,7 @@ export function runestone_auto_import() {
         $("[data-component]").map(
             // Extract the value of the data-component attribute.
             (index, element) => $(element).attr("data-component")
-        // Switch from a jQuery object back to an array, passing that to the Set constructor.
+            // Switch from a jQuery object back to an array, passing that to the Set constructor.
         ).get()
     );