From ddc8e877473f60233f3d80bf19decdd31175b07f Mon Sep 17 00:00:00 2001 From: Robert Johnson Date: Mon, 29 Sep 2014 22:47:01 -0500 Subject: [PATCH 1/3] allow for address change, while still allowing use of BIP44. --- src/index.html | 11 +++++++++++ src/js/index.js | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 837c735..695570f 100644 --- a/src/index.html +++ b/src/index.html @@ -205,6 +205,17 @@

Derived Addresses

Note these addreses are derived from the BIP32 Extended Key

+
+ +
+ +
+
diff --git a/src/js/index.js b/src/js/index.js index 09bcdd9..24456bb 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -16,6 +16,7 @@ DOM.network = $(".network"); DOM.phraseNetwork = $("#network-phrase"); DOM.bip44Network = $("#network-bip44"); + DOM.addressNetwork = $("#network-address-type"); DOM.phrase = $(".phrase"); DOM.passphrase = $(".passphrase"); DOM.generate = $(".generate"); @@ -89,10 +90,13 @@ } else if (n == "dogecoin") { network = Bitcoin.networks.dogecoin; - disableBip44Tab(); + //disableBip44Tab(); } DOM.phraseNetwork.val(n); DOM.bip44Network.val(n); + if(e.target != DOM.addressNetwork.dom){ + DOM.addressNetwork.val(n); + } delayedPhraseChanged(); } From 507a9c2925dd46f0cbba4c53d2a95cd9ed01dbcf Mon Sep 17 00:00:00 2001 From: Robert Johnson Date: Mon, 29 Sep 2014 22:50:49 -0500 Subject: [PATCH 2/3] updated standalone --- bip39-standalone.html | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/bip39-standalone.html b/bip39-standalone.html index ce82c30..debc6f2 100644 --- a/bip39-standalone.html +++ b/bip39-standalone.html @@ -6409,6 +6409,16 @@ button.close {

Derived Addresses

Note these addreses are derived from the BIP32 Extended Key

+
+ +
+ +
@@ -33845,6 +33855,7 @@ var Mnemonic = function(language) { DOM.network = $(".network"); DOM.phraseNetwork = $("#network-phrase"); DOM.bip44Network = $("#network-bip44"); + DOM.addressNetwork = $("#network-address-type"); DOM.phrase = $(".phrase"); DOM.passphrase = $(".passphrase"); DOM.generate = $(".generate"); @@ -33918,10 +33929,13 @@ var Mnemonic = function(language) { } else if (n == "dogecoin") { network = Bitcoin.networks.dogecoin; - disableBip44Tab(); + //disableBip44Tab(); } DOM.phraseNetwork.val(n); DOM.bip44Network.val(n); + if(e.target != DOM.addressNetwork.dom){ + DOM.addressNetwork.val(n); + } delayedPhraseChanged(); } From 5f231c99519e3de57f9a84f6807ecf7d4975d728 Mon Sep 17 00:00:00 2001 From: Robert Johnson Date: Mon, 29 Sep 2014 22:57:48 -0500 Subject: [PATCH 3/3] fixed spacing, added missing tag --- bip39-standalone.html | 11 ++++++----- src/index.html | 2 +- src/js/index.js | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/bip39-standalone.html b/bip39-standalone.html index debc6f2..2769ec3 100644 --- a/bip39-standalone.html +++ b/bip39-standalone.html @@ -6409,7 +6409,7 @@ button.close {

Derived Addresses

Note these addreses are derived from the BIP32 Extended Key

-
+
+
@@ -33855,7 +33856,7 @@ var Mnemonic = function(language) { DOM.network = $(".network"); DOM.phraseNetwork = $("#network-phrase"); DOM.bip44Network = $("#network-bip44"); - DOM.addressNetwork = $("#network-address-type"); + DOM.addressNetwork = $("#network-address-type"); DOM.phrase = $(".phrase"); DOM.passphrase = $(".passphrase"); DOM.generate = $(".generate"); @@ -33933,9 +33934,9 @@ var Mnemonic = function(language) { } DOM.phraseNetwork.val(n); DOM.bip44Network.val(n); - if(e.target != DOM.addressNetwork.dom){ - DOM.addressNetwork.val(n); - } + if(e.target != DOM.addressNetwork.dom){ + DOM.addressNetwork.val(n); + } delayedPhraseChanged(); } diff --git a/src/index.html b/src/index.html index 695570f..5ff997b 100644 --- a/src/index.html +++ b/src/index.html @@ -205,7 +205,7 @@

Derived Addresses

Note these addreses are derived from the BIP32 Extended Key

-
+