diff --git a/src/js/index.js b/src/js/index.js index 5d031b2..0c8344f 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -232,7 +232,14 @@ if (phraseChangeTimeoutEvent != null) { clearTimeout(phraseChangeTimeoutEvent); } - phraseChangeTimeoutEvent = setTimeout(phraseChanged, 400); + phraseChangeTimeoutEvent = setTimeout(function() { + phraseChanged(); + var entropy = mnemonic.toRawEntropyHex(DOM.phrase.val()); + if (entropy !== null) { + DOM.entropyMnemonicLength.val("raw"); + DOM.entropy.val(entropy); + } + }, 400); } function phraseChanged() { diff --git a/src/js/jsbip39.js b/src/js/jsbip39.js index 3230e3b..9a6e7ec 100644 --- a/src/js/jsbip39.js +++ b/src/js/jsbip39.js @@ -97,22 +97,10 @@ var Mnemonic = function(language) { } self.check = function(mnemonic) { - var mnemonic = self.splitWords(mnemonic); - if (mnemonic.length == 0 || mnemonic.length % 3 > 0) { - return false + var b = mnemonicToBinaryString(mnemonic); + if (b === null) { + return false; } - // idx = map(lambda x: bin(self.wordlist.index(x))[2:].zfill(11), mnemonic) - var idx = []; - for (var i=0; i 0) { + return null; + } + // idx = map(lambda x: bin(self.wordlist.index(x))[2:].zfill(11), mnemonic) + var idx = []; + for (var i=0; i