Merge pull request #15 from dooglus/clam

Add CLAM.

diff --git a/bip39-standalone.html b/bip39-standalone.html
index a31ac2fddb8b9d2b0699f19893a7df1bf244d452..5ef69eacea5452a9bf741784ac912c3c60fcfd9d 100644 (file)
--- a/bip39-standalone.html
+++ b/bip39-standalone.html
@@ -70,7 +70,7 @@
                             <label for="strength" class="col-sm-2 control-label">Number of words</label>
                             <div class="col-sm-10">
                                 <div class="input-group">
-                                    <input type="number" class="strength form-control" id="strength" value="12">
+                                    <input type="number" class="strength form-control" id="strength" value="15">
                                     <span class="input-group-btn">
                                         <button class="btn generate">Generate Random Mnemonic</button>
                                     </span>
@@ -14726,7 +14726,6 @@ var Mnemonic = function(language) {
 
     function bip44Changed() {
         setBip44DerivationPath();
-        derivationPath = DOM.bip44path.val();
         derivationChanged();
     }
 
@@ -14928,7 +14927,7 @@ var Mnemonic = function(language) {
             addressCell.addClass("invisible");
         }
         if (!showPrivKey) {
-            privkeCell.addClass("invisible");
+            privkeyCell.addClass("invisible");
         }
         DOM.addresses.append(row);
     }
@@ -14954,6 +14953,7 @@ var Mnemonic = function(language) {
         path += account + "'/";
         path += change;
         DOM.bip44path.val(path);
+        derivationPath = DOM.bip44path.val();
     }
 
     function parseIntNoNaN(val, defaultVal) {

diff --git a/src/index.html b/src/index.html
index 59ef1a02359fc5aa75230762fea0be0561cf55a2..34b4248de61b4acd2f6e6256954bf7d67a81f89c 100644 (file)
--- a/src/index.html
+++ b/src/index.html
@@ -66,7 +66,7 @@
                             <label for="strength" class="col-sm-2 control-label">Number of words</label>
                             <div class="col-sm-10">
                                 <div class="input-group">
-                                    <input type="number" class="strength form-control" id="strength" value="12">
+                                    <input type="number" class="strength form-control" id="strength" value="15">
                                     <span class="input-group-btn">
                                         <button class="btn generate">Generate Random Mnemonic</button>
                                     </span>

diff --git a/src/js/index.js b/src/js/index.js
index a1cc31b7cde71613c81fb480d579886526ec8142..0a662a81e8e69d05e961fb04e72a32ef452101b8 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -135,7 +135,6 @@
 
     function bip44Changed() {
         setBip44DerivationPath();
-        derivationPath = DOM.bip44path.val();
         derivationChanged();
     }
 
@@ -337,7 +336,7 @@
             addressCell.addClass("invisible");
         }
         if (!showPrivKey) {
-            privkeCell.addClass("invisible");
+            privkeyCell.addClass("invisible");
         }
         DOM.addresses.append(row);
     }
@@ -363,6 +362,7 @@
         path += account + "'/";
         path += change;
         DOM.bip44path.val(path);
+        derivationPath = DOM.bip44path.val();
     }
 
     function parseIntNoNaN(val, defaultVal) {