mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-20 14:56:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into v9

Browse source
This commit is contained in:
n1474335 2019-07-05 12:30:28 +01:00
commit e4e32a9c56
22 changed files with 384 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/web/App.mjs
View file

@ -256,7 +256,7 @@ class App {
for (let j = 0; j < catConf.ops.length; j++) {
const opName = catConf.ops[j];
if (!this.operations.hasOwnProperty(opName)) {
if (!(opName in this.operations)) {
log.warn(`${opName} could not be found.`);
continue;
}
@ -372,7 +372,7 @@ class App {
validFavourites(favourites) {
const validFavs = [];
for (let i = 0; i < favourites.length; i++) {
if (this.operations.hasOwnProperty(favourites[i])) {
if (favourites[i] in this.operations) {
validFavs.push(favourites[i]);
} else {
this.alert(`The operation "${Utils.escapeHtml(favourites[i])}" is no longer available. ` +