Merge pull request #3 from robjohnson189/coin_selection

Coin selection
This commit is contained in:
iancoleman
2014-10-13 10:45:13 +11:00
3 changed files with 32 additions and 2 deletions

View File

@@ -6409,6 +6409,17 @@ button.close {
<div class="col-md-12"> <div class="col-md-12">
<h2>Derived Addresses</h2> <h2>Derived Addresses</h2>
<p>Note these addreses are derived from the <strong>BIP32 Extended Key</strong></p> <p>Note these addreses are derived from the <strong>BIP32 Extended Key</strong></p>
<div class="form-group">
<label for="network-address-type" class="col-sm-2 control-label">Coin</label>
<div class="col-sm-10">
<select id="network-address-type" class="network form-control">
<option value="bitcoin">Bitcoin</option>
<option value="bitcoin-testnet">Bitcoin Testnet</option>
<option value="litecoin">Litecoin</option>
<option value="dogecoin">Dogecoin</option>
</select>
</div>
<div>
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<th> <th>
@@ -33845,6 +33856,7 @@ var Mnemonic = function(language) {
DOM.network = $(".network"); DOM.network = $(".network");
DOM.phraseNetwork = $("#network-phrase"); DOM.phraseNetwork = $("#network-phrase");
DOM.bip44Network = $("#network-bip44"); DOM.bip44Network = $("#network-bip44");
DOM.addressNetwork = $("#network-address-type");
DOM.phrase = $(".phrase"); DOM.phrase = $(".phrase");
DOM.passphrase = $(".passphrase"); DOM.passphrase = $(".passphrase");
DOM.generate = $(".generate"); DOM.generate = $(".generate");
@@ -33918,10 +33930,13 @@ var Mnemonic = function(language) {
} }
else if (n == "dogecoin") { else if (n == "dogecoin") {
network = Bitcoin.networks.dogecoin; network = Bitcoin.networks.dogecoin;
disableBip44Tab(); //disableBip44Tab();
} }
DOM.phraseNetwork.val(n); DOM.phraseNetwork.val(n);
DOM.bip44Network.val(n); DOM.bip44Network.val(n);
if(e.target != DOM.addressNetwork.dom){
DOM.addressNetwork.val(n);
}
delayedPhraseChanged(); delayedPhraseChanged();
} }

View File

@@ -205,6 +205,17 @@
<div class="col-md-12"> <div class="col-md-12">
<h2>Derived Addresses</h2> <h2>Derived Addresses</h2>
<p>Note these addreses are derived from the <strong>BIP32 Extended Key</strong></p> <p>Note these addreses are derived from the <strong>BIP32 Extended Key</strong></p>
<div class="form-group">
<label for="network-address-type" class="col-sm-2 control-label">Coin</label>
<div class="col-sm-10">
<select id="network-address-type" class="network form-control">
<option value="bitcoin">Bitcoin</option>
<option value="bitcoin-testnet">Bitcoin Testnet</option>
<option value="litecoin">Litecoin</option>
<option value="dogecoin">Dogecoin</option>
</select>
</div>
</div>
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<th> <th>

View File

@@ -16,6 +16,7 @@
DOM.network = $(".network"); DOM.network = $(".network");
DOM.phraseNetwork = $("#network-phrase"); DOM.phraseNetwork = $("#network-phrase");
DOM.bip44Network = $("#network-bip44"); DOM.bip44Network = $("#network-bip44");
DOM.addressNetwork = $("#network-address-type");
DOM.phrase = $(".phrase"); DOM.phrase = $(".phrase");
DOM.passphrase = $(".passphrase"); DOM.passphrase = $(".passphrase");
DOM.generate = $(".generate"); DOM.generate = $(".generate");
@@ -89,10 +90,13 @@
} }
else if (n == "dogecoin") { else if (n == "dogecoin") {
network = Bitcoin.networks.dogecoin; network = Bitcoin.networks.dogecoin;
disableBip44Tab(); //disableBip44Tab();
} }
DOM.phraseNetwork.val(n); DOM.phraseNetwork.val(n);
DOM.bip44Network.val(n); DOM.bip44Network.val(n);
if(e.target != DOM.addressNetwork.dom){
DOM.addressNetwork.val(n);
}
delayedPhraseChanged(); delayedPhraseChanged();
} }