8 年之前 · ca8fef1c90
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -355,9 +355,16 @@ module.exports = function(grunt) {
 
															                     css: "type='text/css'"
														
 
															                 }
														
 
															             },
														
 
															-            prod: {
														
 
															+            compiled: {
														
 
															                 src: "build/prod/cyberchef.htm",
														
 
															                 dest: "build/prod/cyberchef.htm"
														
 
															+            },
														
 
															+            prod: {
														
 
															+                options: {
														
 
															+                    tag: "__inline"
														
 
															+                },
														
 
															+                src: "build/prod/index.html",
														
 
															+                dest: "build/prod/index.html"
														
 
															             }
														
 
															         },
														
 
															         chmod: {
														
@@ -424,7 +431,7 @@ module.exports = function(grunt) {
 
															             },
														
 
															             js: {
														
 
															                 files: "src/js/**/*.js",
														
 
															-                tasks: ["concat:js_all", "chmod:build"]
														
 
															+                tasks: ["concat:js", "chmod:build"]
														
 
															             },
														
 
															             html: {
														
 
															                 files: "src/html/**/*.html",
														
@@ -436,7 +443,7 @@ module.exports = function(grunt) {
 
															             },
														
 
															             grunt: {
														
 
															                 files: "Gruntfile.js",
														
 
															-                tasks: ["clean:dev", "concat:css", "concat:js_all", "copy:html_dev", "copy:static_dev", "chmod:build"]
														
 
															+                tasks: ["clean:dev", "concat:css", "concat:js", "copy:html_dev", "copy:static_dev", "chmod:build"]
														
 
															             }
														
 
															         },
														
 
															     });
														
--- a/build/prod/cyberchef.htm
+++ b/build/prod/cyberchef.htm
--- a/build/prod/index.html
+++ b/build/prod/index.html
--- a/build/prod/scripts.js
+++ b/build/prod/scripts.js
--- a/src/html/index.html
+++ b/src/html/index.html
@@ -29,7 +29,7 @@
 
															         <meta name="description" content="The Cyber Swiss Army Knife" />
														
 
															         <meta name="keywords" content="base64, hex, decode, encode, encrypt, decrypt, compress, decompress, regex, regular expressions, hash, crypt, hexadecimal, user agent, url, certificate, x.509, parser, JSON, gzip,  md5, sha1, aes, des, blowfish, xor" />
														
 
															-        <link rel="icon" type="image/png" href="images/favicon.ico" />
														
 
															+        <link rel="icon" type="image/png" href="images/favicon.ico?__inline" />
														
 
															         <link href="styles.css" rel="stylesheet" />
														
 
															     </head>
														
 
															     <body>
														
--- a/src/js/views/html/HTMLApp.js
+++ b/src/js/views/html/HTMLApp.js
@@ -279,8 +279,8 @@ HTMLApp.prototype.valid_favourites = function(favourites) {
 
															         if (this.operations.hasOwnProperty(favourites[i])) {
														
 
															             valid_favs.push(favourites[i]);
														
 
															         } else {
														
 
															-            this.alert("The operation \"" + favourites[i] + "\" is no longer " +
														
 
															-                "available. It has been removed from your favourites.", "info");
														
 
															+            this.alert("The operation \"" + Utils.escape_html(favourites[i]) +
														
 
															+                "\" is no longer available. It has been removed from your favourites.", "info");
														
 
															         }
														
 
															     }
														
 
															     return valid_favs;
														
@@ -436,7 +436,8 @@ HTMLApp.prototype.set_recipe_config = function(recipe_config) {
 
															             } else if (args[j].classList.contains("toggle-string")) {
														
 
															                 // toggle_string
														
 
															                 args[j].value = recipe_config[i].args[j].string;
														
 
															-                args[j].previousSibling.children[0].innerHTML = recipe_config[i].args[j].option +
														
 
															+                args[j].previousSibling.children[0].innerHTML =
														
 
															+                    Utils.escape_html(recipe_config[i].args[j].option) +
														
 
															                     " <span class='caret'></span>";
														
 
															             } else {
														
 
															                 // all others
														
--- a/src/static/stats.txt
+++ b/src/static/stats.txt
@@ -1,18 +1,32 @@
 
															 202	source files
														
 
															+<<<<<<< HEAD
														
 
															 104240	lines
														
 
															 	size
														
 
															 136	JavaScript source files
														
 
															 95168	lines
														
 
															 3.5M	size
														
 
															+=======
														
 
															+104191	lines
														
 
															+4.0M	size
														
 
															+
														
 
															+136	JavaScript source files
														
 
															+95119	lines
														
 
															+3.4M	size
														
 
															+>>>>>>> upstream/master
														
 
															 78	third party JavaScript source files
														
 
															 76377	lines
														
 
															 2.8M	size
														
 
															 58	first party JavaScript source files
														
 
															+<<<<<<< HEAD
														
 
															 18791	lines
														
 
															 736K	size
														
 
															+=======
														
 
															+18742	lines
														
 
															+724K	size
														
 
															+>>>>>>> upstream/master
														
 
															 3.1M	uncompressed JavaScript size
														
 
															 1.7M	compressed JavaScript size