at the risk of upsetting some users segwit addresses have now been enabled by default in the #wallet section, with the option to switch between legacy and segwit very easily.

This commit is contained in:
OutCast3k 2017-10-01 18:06:57 +00:00
parent c2ef949dd0
commit b1603821da
3 changed files with 33 additions and 6 deletions

View file

@ -156,7 +156,7 @@
<div class="hidden optionsAdvanced">
<label>Segregated Witness Address</label>
<p class="checkbox">
<label><input type="checkbox" id="walletSegwit" class="checkbox-inline"> Use a segwit address instead of a regular address.</label>
<label><input type="checkbox" id="walletSegwit" class="checkbox-inline" checked> Use a segwit address instead of a regular address. <span class="text-muted"><i>(recommended)</i></span></label></label>
</p>
</div>
</div>
@ -174,7 +174,15 @@
<div id="walletQrCode"></div> <br>
<div>
<span id="walletLoader" class="hidden"><img src="images/loader.gif"></span>
<span id="walletAddress"></span>
<span id="walletAddress"></span>
<div class="btn-group">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" id="walletToBtn">SegWit <span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="javascript:;" id="walletToSegWit">SegWit</a></li>
<li><a href="javascript:;" id="walletToLegacy">Legacy</a></li>
</ul>
</div>
</div>
<br>
<div style="text-align:center; width:350px;">

View file

@ -6,6 +6,8 @@ $(document).ready(function() {
var explorer_addr = "https://coinb.in/addr/"
var explorer_block = "https://coinb.in/block/"
var wallet_timer = false;
$("#openBtn").click(function(){
var email = $("#openEmail").val().toLowerCase();
if(email.match(/[\s\w\d]+@[\s\w\d]+/g)){
@ -88,6 +90,19 @@ $(document).ready(function() {
$("#openLoginStatus").html("").hide();
});
$("#walletToSegWit").click(function(){
$("#walletToBtn").html('SegWit <span class="caret"></span>');
$("#walletSegwit")[0].checked = true;
$("#openBtn").click();
});
$("#walletToLegacy").click(function(){
$("#walletToBtn").html('Legacy <span class="caret"></span>');
$("#walletSegwit")[0].checked = false;
$("#openBtn").click();
});
$("#walletShowKeys").click(function(){
$("#walletKeys").removeClass("hidden");
$("#walletSpend").removeClass("hidden").addClass("hidden");
@ -262,7 +277,8 @@ $(document).ready(function() {
}
function checkBalanceLoop(){
setTimeout(function(){
clearTimeout(wallet_timer);
wallet_timer = setTimeout(function(){
if($("#walletLoader").hasClass("hidden")){
walletBalance();
}

View file

@ -1,8 +1,8 @@
---- Version 1.3 2017.09.21 ----
---- Version 1.3 2017.10.01 ----
77e4519962e2f6a9fc93342137dbb31c33b76b04 ./js/aes.js
3a09a8fc0cfe828b57fc798d668234d0490ee1a6 ./js/bootstrap-datetimepicker.min.js
253711c6d825de55a8360552573be950da180614 ./js/bootstrap.min.js
3ac0e33ea28610e6f784658efcd88802bdd18119 ./js/coinbin.js
e25332acfd75cb76139a5f9ebe268fa7374e8989 ./js/coinbin.js
494cefb8d6e59415ad25587de87a3dd1c055855e ./js/coin.js
988565bc2cb402d63ed5c5fd7ff47c4278efc2c5 ./js/collapse.js
9ba5ede3d7f9d4c8fd623395f196adfdcf7e970f ./js/crypto-min.js
@ -30,4 +30,7 @@ de51a8494180a6db074af2dee2383f0a363c5b08 ./fonts/glyphicons-halflings-regular.s
278e49a86e634da6f2a02f3b47dd9d2a8f26210f ./fonts/glyphicons-halflings-regular.woff
44bc1850f570972267b169ae18f1cb06b611ffa2 ./fonts/glyphicons-halflings-regular.ttf
d8a324a13501cd5705dc26b945fc8088f00907ae ./README.md
45bb7cbfe003039b3e527ecc38a18786de55a843 ./index.html
fa37c3b94927a222abf589a1c16129a3a3f4b4ab ./index.html