Merge branch 'master' into peer_support

Author: bnmnetp

package.json

@@ -19,6 +19,7 @@
     "license": "ISC",
     "devDependencies": {
         "copy-webpack-plugin": "^8.0.0",
+        "compression-webpack-plugin": "^6.0.0",
         "css-loader": "^5.0.0",
         "css-minimizer-webpack-plugin": "^3.0.0",
         "eslint": "^7.0.0",

runestone/activecode/js/livecode.js

@@ -29,7 +29,7 @@ export default class LiveCode extends ActiveCode {
         }
         this.createErrorOutput();
     }
-    outputfun(a) {}
+    outputfun(a) { }
     createInputElement() {
         var label = document.createElement("label");
         label.for = this.divid + "_stdin";
@@ -43,12 +43,20 @@ export default class LiveCode extends ActiveCode {
         this.outerDiv.appendChild(input);
         this.stdin_el = input;
     }
-    createErrorOutput() {}
+    createErrorOutput() { }
 
     /*  Main runProg method for livecode
      *
      */
-    async runProg() {
+    async runProg(noUI, logResults) {
+        if (typeof logResults === "undefined") {
+            this.logResults = true;
+        } else {
+            this.logResults = logResults;
+        }
+        if (typeof noUI !== "boolean") {
+            noUI = false;
+        }
         await this.runSetup();
         try {
             let res = await this.submitToJobe();
@@ -197,9 +205,9 @@ export default class LiveCode extends ActiveCode {
             public static void main(String[] args) {
                 CodeTestHelper.resetFinalResults();
                 Result result = JUnitCore.runClasses(${testdrivername.replace(
-                    ".java",
-                    ".class"
-                )});
+            ".java",
+            ".class"
+        )});
                 System.out.println(CodeTestHelper.getFinalResults());
 
                 int total = result.getRunCount();

runestone/common/js/bookfuncs.js

@@ -193,7 +193,10 @@ async function handlePageSetup() {
         }
         $(document).trigger("runestone:login");
         addReadingList();
-        timedRefresh();
+        // Avoid the timedRefresh on the grading page.
+        if (window.location.pathname.indexOf("/admin/grading") == -1) {
+            timedRefresh();
+        }
     } else {
         mess = "Not logged in";
         $(document).trigger("runestone:logout");

runestone/common/js/runestonebase.js

@@ -140,7 +140,6 @@ export default class RunestoneBase {
         }
         return post_return;
     }
-
     // .. _logRunEvent:
     //
     // logRunEvent

webpack.config.js

@@ -10,6 +10,7 @@ const path = require("path");
 
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const CopyPlugin = require('copy-webpack-plugin');
+const CompressionPlugin = require("compression-webpack-plugin");
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
@@ -90,6 +91,8 @@ module.exports = (env, argv) => {
                 filename: '[name].css?v=[contenthash]',
                 chunkFilename: '[id].css',
             }),
+            // Copied from the `webpack docs <https://webpack.js.org/plugins/compression-webpack-plugin>`_. This creates ``.gz`` versions of all files. The webserver in use needs to be configured to send this instead of the uncompressed versions.
+            new CompressionPlugin(),
         ],
     };
 };