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

Resolved conflicts

Browse source
This commit is contained in:
n1474335 2017-12-27 12:50:29 +00:00
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);