From 328142dac76c5577819f251b4b9a5e926141fe09 Mon Sep 17 00:00:00 2001 From: n1474335 Date: Thu, 1 Mar 2018 20:32:09 +0000 Subject: [PATCH] Added 's' to the standalone version string --- Gruntfile.js | 6 ++++-- src/web/ControlsWaiter.js | 11 +++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index ec7e5f54..4595a48d 100755 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -258,12 +258,14 @@ module.exports = function (grunt) { path: __dirname + "/build/prod" }, plugins: [ - new webpack.DefinePlugin(BUILD_CONSTANTS), + new webpack.DefinePlugin(Object.assign({}, BUILD_CONSTANTS, { + INLINE: "true" + })), new HtmlWebpackPlugin({ filename: "cyberchef.htm", template: "./src/web/html/index.html", compileTime: compileTime, - version: pkg.version, + version: pkg.version + "s", inline: true, minify: { removeComments: true, diff --git a/src/web/ControlsWaiter.js b/src/web/ControlsWaiter.js index a49ad4fa..a9b7490c 100755 --- a/src/web/ControlsWaiter.js +++ b/src/web/ControlsWaiter.js @@ -382,10 +382,13 @@ ControlsWaiter.prototype.supportButtonClick = function(e) { const saveLink = this.generateStateUrl(true, true, null, "https://gchq.github.io/CyberChef/"); if (reportBugInfo) { - reportBugInfo.innerHTML = "* Version: " + PKG_VERSION + "\n" + - "* Compile time: " + COMPILE_TIME + "\n" + - "* User-Agent: \n" + navigator.userAgent + "\n" + - "* [Link to reproduce](" + saveLink + ")\n\n"; + reportBugInfo.innerHTML = `* Version: ${PKG_VERSION + (typeof INLINE === "undefined" ? "" : "s")} +* Compile time: ${COMPILE_TIME} +* User-Agent: +${navigator.userAgent} +* [Link to reproduce](${saveLink}) + +`; } };