From a30babc682cc2927541205512927c6d021f34c70 Mon Sep 17 00:00:00 2001 From: Matt C Date: Sat, 4 Feb 2017 00:17:04 +0000 Subject: [PATCH] Fixes required changes gchq/CyberChef#67 --- src/js/operations/MorseCode.js | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/js/operations/MorseCode.js b/src/js/operations/MorseCode.js index a9cab2d6..46d1b958 100644 --- a/src/js/operations/MorseCode.js +++ b/src/js/operations/MorseCode.js @@ -93,8 +93,8 @@ var MorseCode = { var dash = format[0]; var dot = format[1]; - var letter_delim = MorseCode.OPTION_TABLE[args[1]]; - var word_delim = MorseCode.OPTION_TABLE[args[2]]; + var letterDelim = MorseCode.OPTION_TABLE[args[1]]; + var wordDelim = MorseCode.OPTION_TABLE[args[2]]; input = input.split(/\r?\n/); input = Array.prototype.map.call(input, function(line) { @@ -122,16 +122,16 @@ var MorseCode = { switch(match) { case "": return dash; case "": return dot; - case "": return letter_delim; - case "": return word_delim; + case "": return letterDelim; + case "": return wordDelim; } } ); return input; }, - - + + /** * From Morse Code operation. * @@ -155,27 +155,26 @@ var MorseCode = { reverseTable(); } - var letter_delim = MorseCode.OPTION_TABLE[args[0]]; - var word_delim = MorseCode.OPTION_TABLE[args[1]]; + var letterDelim = MorseCode.OPTION_TABLE[args[0]]; + var wordDelim = MorseCode.OPTION_TABLE[args[1]]; - input = input.replace(/-|_|dash/ig, "") - input = input.replace(/\.|dot/ig, "") + input = input.replace(/-|_|dash/ig, ""); + input = input.replace(/\.|dot/ig, ""); - var words = input.split(word_delim); + var words = input.split(wordDelim); words = Array.prototype.map.call(words, function(word) { - var signals = word.split(letter_delim); + var signals = word.split(letterDelim); var letters = signals.map(function(signal) { return reversedTable[signal]; }); - var word = letters.join(""); - return word; + return letters.join(""); }); words = words.join(" "); return words; }; })(), - + };