jgaunt/CyberChef
2
0
Fork 0
mirror of https://github.com/gchq/CyberChef synced 2025-12-14 23:33:25 +00:00
Code Issues Releases Wiki Activity

Resolved conflicts

Browse Source
This commit is contained in:
n1474335
2017-12-27 12:50:29 +00:00
parent 1e4d2ba90d 8ee3742216
commit e2161ec934
25 changed files with 811 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/Dish.js
View File

@@ -13,7 +13,7 @@ import Utils from "./Utils.js";
*/
const Dish = function(value, type) {
this.value = value || typeof value === "string" ? value : null;
this.type = type || Dish.BYTE_ARRAY;
this.type = type || Dish.BYTE_ARRAY;
};
@@ -112,7 +112,7 @@ Dish.enumLookup = function(typeEnum) {
*/
Dish.prototype.set = function(value, type) {
this.value = value;
this.type = type;
this.type = type;
if (!this.valid()) {
const sample = Utils.truncate(JSON.stringify(this.value), 13);