diff --git a/index.html b/index.html index bf91bb2..3af517d 100644 --- a/index.html +++ b/index.html @@ -759,35 +759,60 @@ 148 bytes - + +
+ + + +

SegWit 0 0 bytes

- + +
+ + + +

MultiSig 0 0 bytes

- + +
+ + + +

Hodl Time Locked 0 0 bytes

- + +
+ + + +

Unknown 0 0 bytes

- + +
+ + + +

@@ -805,15 +830,25 @@ 68 bytes - + +
+ + + +

Regular p2sh (3...) 0 0 bytes

- - + +
+ + + +
+
@@ -833,7 +868,7 @@

Blockchain Data

-

This is based on us comparing your transaction agianst the last transaction found in the last block

+

This is based on us comparing your transaction against a very recent transaction found in a very recent block

Block Height: ?

Block #: ?

Block Time: ?

diff --git a/js/coinbin.js b/js/coinbin.js index 547572b..eca361d 100644 --- a/js/coinbin.js +++ b/js/coinbin.js @@ -1791,31 +1791,31 @@ $(document).ready(function() { /* fees page code */ - $("#fees .slider").change(function(){ - $('.'+$(this).attr('rel')+' .inputno, .'+$(this).attr('rel')+' .outputno',$(this).parent()).html($(this).val()); - $('.'+$(this).attr('rel')+' .estimate',$(this).parent()).removeClass('hidden'); + $("#fees .slider").on('input', function(){ + $('.'+$(this).attr('rel')+' .inputno, .'+$(this).attr('rel')+' .outputno',$("#fees")).html($(this).val()); + $('.'+$(this).attr('rel')+' .estimate',$("#fees")).removeClass('hidden'); }); - $("#fees .txo_p2pkh").change(function(){ - var outputno = $('.'+$(this).attr('rel')+' .outputno',$(this).parent()).html(); - $('.'+$(this).attr('rel')+' .bytes',$(this).parent()).html((outputno*$("#est_txo_p2pkh").val())+(outputno*9)); + $("#fees .txo_p2pkh").on('input', function(){ + var outputno = $('.'+$(this).attr('rel')+' .outputno',$("#fees .txoutputs")).html(); + $('.'+$(this).attr('rel')+' .bytes',$("#fees .txoutputs")).html((outputno*$("#est_txo_p2pkh").val())+(outputno*9)); mathFees(); }); - $("#fees .txo_p2sh").change(function(){ - var outputno = $('.'+$(this).attr('rel')+' .outputno',$(this).parent()).html(); - $('.'+$(this).attr('rel')+' .bytes',$(this).parent()).html((outputno*$("#est_txo_p2sh").val())+(outputno*9)); + $("#fees .txo_p2sh").on('input', function(){ + var outputno = $('.'+$(this).attr('rel')+' .outputno',$("#fees .txoutputs")).html(); + $('.'+$(this).attr('rel')+' .bytes',$("#fees .txoutputs")).html((outputno*$("#est_txo_p2sh").val())+(outputno*9)); mathFees(); }); - $("#fees .txi_regular").change(function(){ - var inputno = $('.'+$(this).attr('rel')+' .inputno',$(this).parent()).html(); - $('.'+$(this).attr('rel')+' .bytes',$(this).parent()).html((inputno*$("#est_txi_regular").val())+(inputno*41)); + $("#fees .txi_regular").on('input', function(){ + var inputno = $('.'+$(this).attr('rel')+' .inputno',$("#fees .txinputs")).html(); + $('.'+$(this).attr('rel')+' .bytes',$("#fees .txinputs")).html((inputno*$("#est_txi_regular").val())+(inputno*41)); mathFees(); }); - $("#fees .txi_segwit").change(function(){ - var inputno = $('.'+$(this).attr('rel')+' .inputno',$(this).parent()).html(); + $("#fees .txi_segwit").on('input', function(){ + var inputno = $('.'+$(this).attr('rel')+' .inputno',$("#fees .txinputs")).html(); var bytes = 0; if(inputno >= 1){ bytes = 2; @@ -1825,28 +1825,44 @@ $(document).ready(function() { } bytes = bytes.toFixed(0); - $('.'+$(this).attr('rel')+' .bytes',$(this).parent()).html(bytes); + $('.'+$(this).attr('rel')+' .bytes',$("#fees .txinputs")).html(bytes); mathFees(); }); - $("#fees .txi_multisig").change(function(){ - var inputno = $('.'+$(this).attr('rel')+' .inputno',$(this).parent()).html(); - $('.'+$(this).attr('rel')+' .bytes',$(this).parent()).html((inputno*$("#est_txi_multisig").val())+(inputno*41)); + $("#fees .txi_multisig").on('input', function(){ + var inputno = $('.'+$(this).attr('rel')+' .inputno',$("#fees .txinputs")).html(); + $('.'+$(this).attr('rel')+' .bytes',$("#fees .txinputs")).html((inputno*$("#est_txi_multisig").val())+(inputno*41)); mathFees(); }); - $("#fees .txi_hodl").change(function(){ - var inputno = $('.'+$(this).attr('rel')+' .inputno',$(this).parent()).html(); - $('.'+$(this).attr('rel')+' .bytes',$(this).parent()).html((inputno*$("#est_txi_hodl").val())+(inputno*41)); + $("#fees .txi_hodl").on('input', function(){ + var inputno = $('.'+$(this).attr('rel')+' .inputno',$("#fees .txinputs")).html(); + $('.'+$(this).attr('rel')+' .bytes',$("#fees .txinputs")).html((inputno*$("#est_txi_hodl").val())+(inputno*41)); mathFees(); }); - $("#fees .txi_unknown").change(function(){ - var inputno = $('.'+$(this).attr('rel')+' .inputno',$(this).parent()).html(); - $('.'+$(this).attr('rel')+' .bytes',$(this).parent()).html((inputno*$("#est_txi_unknown").val())+(inputno*41)); + $("#fees .txi_unknown").on('input', function(){ + var inputno = $('.'+$(this).attr('rel')+' .inputno',$("#fees .txinputs")).html(); + $('.'+$(this).attr('rel')+' .bytes',$("#fees .txinputs")).html((inputno*$("#est_txi_unknown").val())+(inputno*41)); mathFees(); }); + $("#fees .sliderbtn.down").click(function(){ + var val = $(".slider",$(this).parent().parent()).val()*1; + if(val>($(".slider",$(this).parent().parent()).attr('min')*1)){ + $(".slider",$(this).parent().parent()).val(val-1); + $(".slider",$(this).parent().parent()).trigger('input'); + } + }); + + $("#fees .sliderbtn.up").click(function(){ + var val = $(".slider",$(this).parent().parent()).val()*1; + if(val<($(".slider",$(this).parent().parent()).attr('max')*1)){ + $(".slider",$(this).parent().parent()).val(val+1); + $(".slider",$(this).parent().parent()).trigger('input'); + } + }); + $("#advancedFeesCollapse").click(function(){ if($("#advancedFees").hasClass('hidden')){ $("span",this).removeClass('glyphicon-collapse-down').addClass('glyphicon-collapse-up'); diff --git a/sha1sum b/sha1sum index e3f4a36..8556fd8 100644 --- a/sha1sum +++ b/sha1sum @@ -1,8 +1,8 @@ ----- Version 1.3 2018.01.01 --- +---- Version 1.3 2018.01.03 --- 77e4519962e2f6a9fc93342137dbb31c33b76b04 ./js/aes.js 3a09a8fc0cfe828b57fc798d668234d0490ee1a6 ./js/bootstrap-datetimepicker.min.js 253711c6d825de55a8360552573be950da180614 ./js/bootstrap.min.js -acd94783bcf56758633af126fc6742fe08db9f93 ./js/coinbin.js +f43691b7db457598283d3b146f8b8545b2aa21a1 ./js/coinbin.js 31fbebf65d9cae8f26761cb057c4fb1b97339d08 ./js/coin.js 988565bc2cb402d63ed5c5fd7ff47c4278efc2c5 ./js/collapse.js 9ba5ede3d7f9d4c8fd623395f196adfdcf7e970f ./js/crypto-min.js @@ -31,6 +31,5 @@ de51a8494180a6db074af2dee2383f0a363c5b08 ./fonts/glyphicons-halflings-regular.s 278e49a86e634da6f2a02f3b47dd9d2a8f26210f ./fonts/glyphicons-halflings-regular.woff 44bc1850f570972267b169ae18f1cb06b611ffa2 ./fonts/glyphicons-halflings-regular.ttf d8a324a13501cd5705dc26b945fc8088f00907ae ./README.md -bb129ea3d4df64994fa40a143791304f5cc2fc74 ./index.html - +4cd31f66eafbf86e98def4db6ff1b13ba5dcf01a ./index.html