diff options
Diffstat (limited to 'src/js')
-rw-r--r-- | src/js/index.js | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/src/js/index.js b/src/js/index.js index 3690de1..1076108 100644 --- a/src/js/index.js +++ b/src/js/index.js | |||
@@ -24,14 +24,15 @@ | |||
24 | DOM.useEntropy = $(".use-entropy"); | 24 | DOM.useEntropy = $(".use-entropy"); |
25 | DOM.entropyContainer = $(".entropy-container"); | 25 | DOM.entropyContainer = $(".entropy-container"); |
26 | DOM.entropy = $(".entropy"); | 26 | DOM.entropy = $(".entropy"); |
27 | DOM.entropyFeedback = $(".entropy-feedback"); | 27 | DOM.entropyFiltered = DOM.entropyContainer.find(".filtered"); |
28 | DOM.entropyFiltered = DOM.entropyFeedback.find(".filtered"); | 28 | DOM.entropyType = DOM.entropyContainer.find(".type"); |
29 | DOM.entropyType = DOM.entropyFeedback.find(".type"); | 29 | DOM.entropyStrength = DOM.entropyContainer.find(".strength"); |
30 | DOM.entropyStrength = DOM.entropyFeedback.find(".strength"); | 30 | DOM.entropyEventCount = DOM.entropyContainer.find(".event-count"); |
31 | DOM.entropyEventCount = DOM.entropyFeedback.find(".event-count"); | 31 | DOM.entropyBits = DOM.entropyContainer.find(".bits"); |
32 | DOM.entropyBits = DOM.entropyFeedback.find(".bits"); | 32 | DOM.entropyBitsPerEvent = DOM.entropyContainer.find(".bits-per-event"); |
33 | DOM.entropyBitsPerEvent = DOM.entropyFeedback.find(".bits-per-event"); | 33 | DOM.entropyWordCount = DOM.entropyContainer.find(".word-count"); |
34 | DOM.entropyMnemonicLength = DOM.entropyFeedback.find(".mnemonic-length"); | 34 | DOM.entropyBinary = DOM.entropyContainer.find(".binary"); |
35 | DOM.entropyMnemonicLength = DOM.entropyContainer.find(".mnemonic-length"); | ||
35 | DOM.phrase = $(".phrase"); | 36 | DOM.phrase = $(".phrase"); |
36 | DOM.passphrase = $(".passphrase"); | 37 | DOM.passphrase = $(".passphrase"); |
37 | DOM.generateContainer = $(".generate-container"); | 38 | DOM.generateContainer = $(".generate-container"); |
@@ -161,7 +162,7 @@ | |||
161 | // If blank entropy, clear mnemonic, addresses, errors | 162 | // If blank entropy, clear mnemonic, addresses, errors |
162 | if (DOM.entropy.val().trim().length == 0) { | 163 | if (DOM.entropy.val().trim().length == 0) { |
163 | clearDisplay(); | 164 | clearDisplay(); |
164 | hideEntropyFeedback(); | 165 | clearEntropyFeedback(); |
165 | DOM.phrase.val(""); | 166 | DOM.phrase.val(""); |
166 | showValidationError("Blank entropy"); | 167 | showValidationError("Blank entropy"); |
167 | return; | 168 | return; |
@@ -735,7 +736,7 @@ | |||
735 | } | 736 | } |
736 | 737 | ||
737 | function setMnemonicFromEntropy() { | 738 | function setMnemonicFromEntropy() { |
738 | hideEntropyFeedback(); | 739 | clearEntropyFeedback(); |
739 | // Get entropy value | 740 | // Get entropy value |
740 | var entropyStr = DOM.entropy.val(); | 741 | var entropyStr = DOM.entropy.val(); |
741 | // Work out minimum base for entropy | 742 | // Work out minimum base for entropy |
@@ -777,14 +778,15 @@ | |||
777 | DOM.phrase.val(phrase); | 778 | DOM.phrase.val(phrase); |
778 | } | 779 | } |
779 | 780 | ||
780 | function hideEntropyFeedback() { | 781 | function clearEntropyFeedback() { |
781 | DOM.entropyFeedback.addClass("hidden"); | 782 | DOM.entropyStrength.text("..."); |
782 | DOM.entropyFiltered.text(""); | ||
783 | DOM.entropyType.text(""); | 783 | DOM.entropyType.text(""); |
784 | DOM.entropyStrength.text(""); | 784 | DOM.entropyWordCount.text("0"); |
785 | DOM.entropyEventCount.text(""); | 785 | DOM.entropyEventCount.text("0"); |
786 | DOM.entropyBits.text(""); | 786 | DOM.entropyBitsPerEvent.text("0"); |
787 | DOM.entropyBitsPerEvent.text(""); | 787 | DOM.entropyBits.text("0"); |
788 | DOM.entropyFiltered.html(" "); | ||
789 | DOM.entropyBinary.html(" "); | ||
788 | } | 790 | } |
789 | 791 | ||
790 | function showEntropyFeedback(entropy) { | 792 | function showEntropyFeedback(entropy) { |
@@ -816,16 +818,15 @@ | |||
816 | }; | 818 | }; |
817 | } | 819 | } |
818 | var bitsStr = entropy.binaryStr.length; | 820 | var bitsStr = entropy.binaryStr.length; |
819 | if (entropy.base.asInt != 2) { | 821 | var wordCount = Math.floor(entropy.binaryStr.length / 32) * 3; |
820 | bitsStr += " (" + entropy.binaryStr + ")"; | ||
821 | } | ||
822 | DOM.entropyFiltered.text(entropy.cleanStr); | 822 | DOM.entropyFiltered.text(entropy.cleanStr); |
823 | DOM.entropyType.text(entropy.base.str); | 823 | DOM.entropyType.text(entropy.base.str); |
824 | DOM.entropyStrength.text(strength); | 824 | DOM.entropyStrength.text(strength); |
825 | DOM.entropyEventCount.text(entropy.base.ints.length); | 825 | DOM.entropyEventCount.text(entropy.base.ints.length); |
826 | DOM.entropyBits.text(bitsStr); | 826 | DOM.entropyBits.text(bitsStr); |
827 | DOM.entropyWordCount.text(wordCount); | ||
828 | DOM.entropyBinary.text(entropy.binaryStr); | ||
827 | DOM.entropyBitsPerEvent.text(Math.log2(entropy.base.asInt).toFixed(2)); | 829 | DOM.entropyBitsPerEvent.text(Math.log2(entropy.base.asInt).toFixed(2)); |
828 | DOM.entropyFeedback.removeClass("hidden"); | ||
829 | } | 830 | } |
830 | 831 | ||
831 | var networks = [ | 832 | var networks = [ |