Standardized words, 'phrase' changed to 'mnemonic'

[perso/Immae/Projets/Cryptomonnaies/BIP39.git] / src / js / index.js

diff --git a/src/js/index.js b/src/js/index.js
index 5bdb7ab5b7c7ea3036ac5210d851b32fb94cace6..7f39ad2e737f39a8e735557fbe1af460a4f7a934 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -32,20 +32,18 @@
     DOM.privateKeyToggle = $(".private-key-toggle");
 
     var derivationPath = DOM.bip44path.val();
-    var currentPhrase = DOM.phrase.val();
-    var currentPassphrase = DOM.passphrase.val();
 
     function init() {
         // Events
-        DOM.phrase.on("keyup", delayedPhraseChanged);
-        DOM.passphrase.on("keyup", delayedPhraseChanged);
+        DOM.phrase.on("input", delayedPhraseChanged);
+        DOM.passphrase.on("input", delayedPhraseChanged);
         DOM.generate.on("click", generateClicked);
         DOM.more.on("click", showMore);
-        DOM.bip32path.on("keyup", bip32Changed);
-        DOM.bip44purpose.on("keyup", bip44Changed);
-        DOM.bip44coin.on("keyup", bip44Changed);
-        DOM.bip44account.on("keyup", bip44Changed);
-        DOM.bip44change.on("keyup", bip44Changed);
+        DOM.bip32path.on("input", bip32Changed);
+        DOM.bip44purpose.on("input", bip44Changed);
+        DOM.bip44coin.on("input", bip44Changed);
+        DOM.bip44account.on("input", bip44Changed);
+        DOM.bip44change.on("input", bip44Changed);
         DOM.tab.on("click", tabClicked);
         DOM.indexToggle.on("click", toggleIndexes);
         DOM.addressToggle.on("click", toggleAddresses);
@@ -58,9 +56,6 @@
     // Event handlers
 
     function delayedPhraseChanged() {
-        if (!hasChanged()) {
-            return;
-        }
         hideValidationError();
         showPending();
         if (phraseChangeTimeoutEvent != null) {
@@ -90,9 +85,6 @@
         calcBip32Seed(phrase, passphrase, derivationPath);
         displayBip32Info();
         hidePending();
-        // Set current state so we only update as needed
-        currentPhrase = phrase;
-        currentPassphrase = passphrase;
     }
 
     function generateClicked() {
@@ -114,9 +106,7 @@
     }
 
     function derivationChanged() {
-        hideValidationError();
-        showPending();
-        setTimeout(phraseChanged, 50);
+        delayedPhraseChanged();
     }
 
     function bip32Changed() {
@@ -345,12 +335,6 @@
             .hide();
     }
 
-    function hasChanged() {
-        var phraseChanged = DOM.phrase.val() != currentPhrase;
-        var passphraseChanged = DOM.passphrase.val() != currentPassphrase;
-        return phraseChanged || passphraseChanged;
-    }
-
     init();
 
 })();