mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-22 07:46:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into feature_xpath

Browse source
This commit is contained in:
Mike Schwörer 2016-12-05 19:30:46 +01:00
commit da7a832ceb
No known key found for this signature in database
GPG key ID: D3C7172E0A70F8CF
7 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/html/index.html
View file

@ -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>

3
src/js/views/html/HTMLApp.js
View file

@ -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

6
src/static/stats.txt
View file

@ -1,9 +1,9 @@
202 source files
104190 lines
104191 lines
4.0M size
136 JavaScript source files
95118 lines
95119 lines
3.4M size
78 third party JavaScript source files
@ -11,7 +11,7 @@
2.7M size
58 first party JavaScript source files
18741 lines
18742 lines
724K size
3.1M uncompressed JavaScript size