LBRYCommunity/coinbin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

various tweaks made to the #fees page

Browse source
This commit is contained in:
OutCast3k 2018-01-03 19:27:53 +00:00
parent e85276dd89
commit 56fa7b5139
3 changed files with 87 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
index.html
View file

@ -759,35 +759,60 @@
<small><span class="bytes">148</span> bytes</small> <small><span class="bytes">148</span> bytes</small>
<small class="estimate hidden"><em> *estimate</em></small> <small class="estimate hidden"><em> *estimate</em></small>
</h4> </h4>
<div class="input-group">
<span class="input-group-btn"><button class="btn sliderbtn down" type="button"><span class="glyphicon glyphicon-chevron-left"></span></button></span>
<input type="range" min="0" max="100" value="1" class="slider txinput txi_regular" rel="regular"> <input type="range" min="0" max="100" value="1" class="slider txinput txi_regular" rel="regular">
<span class="input-group-btn"><button class="btn sliderbtn up" type="button"><span class="glyphicon glyphicon-chevron-right"></span></button></span>
</div>
<h4 class="segwit"><abbr title="Spending from a segwit address. p2sh">SegWit</abbr> <h4 class="segwit"><abbr title="Spending from a segwit address. p2sh">SegWit</abbr>
<span class="badge inputno" title="Number of SegWit Inputs">0</span> <span class="badge inputno" title="Number of SegWit Inputs">0</span>
<small><span class="bytes">0</span> bytes</small> <small><span class="bytes">0</span> bytes</small>
<small class="estimate hidden"><em> *estimate</em></small> <small class="estimate hidden"><em> *estimate</em></small>
</h4> </h4>
<div class="input-group">
<span class="input-group-btn"><button class="btn sliderbtn down" type="button"><span class="glyphicon glyphicon-chevron-left"></span></button></span>
<input type="range" min="0" max="100" value="0" class="slider txinput txi_segwit" rel="segwit"> <input type="range" min="0" max="100" value="0" class="slider txinput txi_segwit" rel="segwit">
<span class="input-group-btn"><button class="btn sliderbtn up" type="button"><span class="glyphicon glyphicon-chevron-right"></span></button></span>
</div>
<h4 class="multisig"><abbr title="Spending from a multisig address. p2sh">MultiSig</abbr> <h4 class="multisig"><abbr title="Spending from a multisig address. p2sh">MultiSig</abbr>
<span class="badge inputno" title="Number of MultiSig Inputs">0</span> <span class="badge inputno" title="Number of MultiSig Inputs">0</span>
<small><span class="bytes">0</span> bytes</small> <small><span class="bytes">0</span> bytes</small>
<small class="estimate hidden"><em> *estimate</em></small> <small class="estimate hidden"><em> *estimate</em></small>
</h4> </h4>
<div class="input-group">
<span class="input-group-btn"><button class="btn sliderbtn down" type="button"><span class="glyphicon glyphicon-chevron-left"></span></button></span>
<input type="range" min="0" max="100" value="0" class="slider txinput txi_multisig" rel="multisig"> <input type="range" min="0" max="100" value="0" class="slider txinput txi_multisig" rel="multisig">
<span class="input-group-btn"><button class="btn sliderbtn up" type="button"><span class="glyphicon glyphicon-chevron-right"></span></button></span>
</div>
<h4 class="hodl"><abbr title="Spending from a time locked address. p2sh">Hodl</abbr> <small>Time Locked</small> <h4 class="hodl"><abbr title="Spending from a time locked address. p2sh">Hodl</abbr> <small>Time Locked</small>
<span class="badge inputno" title="Number of Hodl Inputs">0</span> <span class="badge inputno" title="Number of Hodl Inputs">0</span>
<small><span class="bytes">0</span> bytes</small> <small><span class="bytes">0</span> bytes</small>
<small class="estimate hidden"><em> *estimate</em></small> <small class="estimate hidden"><em> *estimate</em></small>
</h4> </h4>
<div class="input-group">
<span class="input-group-btn"><button class="btn sliderbtn down" type="button"><span class="glyphicon glyphicon-chevron-left"></span></button></span>
<input type="range" min="0" max="100" value="0" class="slider txinput txi_hodl" rel="hodl"> <input type="range" min="0" max="100" value="0" class="slider txinput txi_hodl" rel="hodl">
<span class="input-group-btn"><button class="btn sliderbtn up" type="button"><span class="glyphicon glyphicon-chevron-right"></span></button></span>
</div>
<h4 class="unknown"><abbr title="Spending from an unrecognized input. p2sh">Unknown</abbr> <h4 class="unknown"><abbr title="Spending from an unrecognized input. p2sh">Unknown</abbr>
<span class="badge inputno" title="Number of Unknown Inputs">0</span> <span class="badge inputno" title="Number of Unknown Inputs">0</span>
<small><span class="bytes">0</span> bytes</small> <small><span class="bytes">0</span> bytes</small>
<small class="estimate hidden"><em> *estimate</em></small> <small class="estimate hidden"><em> *estimate</em></small>
</h4> </h4>
<div class="input-group">
<span class="input-group-btn"><button class="btn sliderbtn down" type="button"><span class="glyphicon glyphicon-chevron-left"></span></button></span>
<input type="range" min="0" max="100" value="0" class="slider txinput txi_unknown" rel="unknown"> <input type="range" min="0" max="100" value="0" class="slider txinput txi_unknown" rel="unknown">
<span class="input-group-btn"><button class="btn sliderbtn up" type="button"><span class="glyphicon glyphicon-chevron-right"></span></button></span>
</div>
<br> <br>
</div> </div>
@ -805,14 +830,24 @@
<small><span class="bytes">68</span> bytes</small> <small><span class="bytes">68</span> bytes</small>
<small class="estimate hidden"><em> *estimate</em></small> <small class="estimate hidden"><em> *estimate</em></small>
</h4> </h4>
<div class="input-group">
<span class="input-group-btn"><button class="btn sliderbtn down" type="button"><span class="glyphicon glyphicon-chevron-left"></span></button></span>
<input type="range" min="0" max="100" value="2" class="slider txoutput txo_p2pkh" rel="p2pkh"> <input type="range" min="0" max="100" value="2" class="slider txoutput txo_p2pkh" rel="p2pkh">
<span class="input-group-btn"><button class="btn sliderbtn up" type="button"><span class="glyphicon glyphicon-chevron-right"></span></button></span>
</div>
<h4 class="p2sh"><abbr title="A pay 2 script hash address. Starts with a 3. For example a segwit or multisig address">Regular</abbr> <small>p2sh (3...)</small> <h4 class="p2sh"><abbr title="A pay 2 script hash address. Starts with a 3. For example a segwit or multisig address">Regular</abbr> <small>p2sh (3...)</small>
<span class="badge outputno" title="Number of p2sh Outputs">0</span> <span class="badge outputno" title="Number of p2sh Outputs">0</span>
<small><span class="bytes">0</span> bytes</small> <small><span class="bytes">0</span> bytes</small>
<small class="estimate hidden"><em> *estimate</em></small> <small class="estimate hidden"><em> *estimate</em></small>
</h4> </h4>
<div class="input-group">
<span class="input-group-btn"><button class="btn sliderbtn down" type="button"><span class="glyphicon glyphicon-chevron-left"></span></button></span>
<input type="range" min="0" max="100" value="0" class="slider txoutput txo_p2sh" rel="p2sh"> <input type="range" min="0" max="100" value="0" class="slider txoutput txo_p2sh" rel="p2sh">
<span class="input-group-btn"><button class="btn sliderbtn up" type="button"><span class="glyphicon glyphicon-chevron-right"></span></button></span>
</div>
<br> <br>
</div> </div>
@ -833,7 +868,7 @@
<h3>Blockchain Data <span class="pull-right"><button type="button" id="feeStatsReload" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-refresh"></span></button></span></h3> <h3>Blockchain Data <span class="pull-right"><button type="button" id="feeStatsReload" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-refresh"></span></button></span></h3>
<p>This is based on us comparing your transaction agianst the last transaction found in the last block</p> <p>This is based on us comparing your transaction against a very recent transaction found in a very recent block</p>
<p><b>Block Height</b>: <span class="blockHeight">?</span></p> <p><b>Block Height</b>: <span class="blockHeight">?</span></p>
<p class="hideOverflow"><b>Block #</b>: <span class="blockHash">?</span></p> <p class="hideOverflow"><b>Block #</b>: <span class="blockHash">?</span></p>
<p><b>Block Time</b>: <span class="blockTime">?</span> <span class="blockDateTime text-muted"></span></p> <p><b>Block Time</b>: <span class="blockTime">?</span> <span class="blockDateTime text-muted"></span></p>

64
js/coinbin.js
View file

@ -1791,31 +1791,31 @@ $(document).ready(function() {
/* fees page code */ /* fees page code */
$("#fees .slider").change(function(){ $("#fees .slider").on('input', function(){
$('.'+$(this).attr('rel')+' .inputno, .'+$(this).attr('rel')+' .outputno',$(this).parent()).html($(this).val()); $('.'+$(this).attr('rel')+' .inputno, .'+$(this).attr('rel')+' .outputno',$("#fees")).html($(this).val());
$('.'+$(this).attr('rel')+' .estimate',$(this).parent()).removeClass('hidden'); $('.'+$(this).attr('rel')+' .estimate',$("#fees")).removeClass('hidden');
}); });
$("#fees .txo_p2pkh").change(function(){ $("#fees .txo_p2pkh").on('input', function(){
var outputno = $('.'+$(this).attr('rel')+' .outputno',$(this).parent()).html(); var outputno = $('.'+$(this).attr('rel')+' .outputno',$("#fees .txoutputs")).html();
$('.'+$(this).attr('rel')+' .bytes',$(this).parent()).html((outputno*$("#est_txo_p2pkh").val())+(outputno*9)); $('.'+$(this).attr('rel')+' .bytes',$("#fees .txoutputs")).html((outputno*$("#est_txo_p2pkh").val())+(outputno*9));
mathFees(); mathFees();
}); });
$("#fees .txo_p2sh").change(function(){ $("#fees .txo_p2sh").on('input', function(){
var outputno = $('.'+$(this).attr('rel')+' .outputno',$(this).parent()).html(); var outputno = $('.'+$(this).attr('rel')+' .outputno',$("#fees .txoutputs")).html();
$('.'+$(this).attr('rel')+' .bytes',$(this).parent()).html((outputno*$("#est_txo_p2sh").val())+(outputno*9)); $('.'+$(this).attr('rel')+' .bytes',$("#fees .txoutputs")).html((outputno*$("#est_txo_p2sh").val())+(outputno*9));
mathFees(); mathFees();
}); });
$("#fees .txi_regular").change(function(){ $("#fees .txi_regular").on('input', function(){
var inputno = $('.'+$(this).attr('rel')+' .inputno',$(this).parent()).html(); var inputno = $('.'+$(this).attr('rel')+' .inputno',$("#fees .txinputs")).html();
$('.'+$(this).attr('rel')+' .bytes',$(this).parent()).html((inputno*$("#est_txi_regular").val())+(inputno*41)); $('.'+$(this).attr('rel')+' .bytes',$("#fees .txinputs")).html((inputno*$("#est_txi_regular").val())+(inputno*41));
mathFees(); mathFees();
}); });
$("#fees .txi_segwit").change(function(){ $("#fees .txi_segwit").on('input', function(){
var inputno = $('.'+$(this).attr('rel')+' .inputno',$(this).parent()).html(); var inputno = $('.'+$(this).attr('rel')+' .inputno',$("#fees .txinputs")).html();
var bytes = 0; var bytes = 0;
if(inputno >= 1){ if(inputno >= 1){
bytes = 2; bytes = 2;
@ -1825,28 +1825,44 @@ $(document).ready(function() {
} }
bytes = bytes.toFixed(0); bytes = bytes.toFixed(0);
$('.'+$(this).attr('rel')+' .bytes',$(this).parent()).html(bytes); $('.'+$(this).attr('rel')+' .bytes',$("#fees .txinputs")).html(bytes);
mathFees(); mathFees();
}); });
$("#fees .txi_multisig").change(function(){ $("#fees .txi_multisig").on('input', function(){
var inputno = $('.'+$(this).attr('rel')+' .inputno',$(this).parent()).html(); var inputno = $('.'+$(this).attr('rel')+' .inputno',$("#fees .txinputs")).html();
$('.'+$(this).attr('rel')+' .bytes',$(this).parent()).html((inputno*$("#est_txi_multisig").val())+(inputno*41)); $('.'+$(this).attr('rel')+' .bytes',$("#fees .txinputs")).html((inputno*$("#est_txi_multisig").val())+(inputno*41));
mathFees(); mathFees();
}); });
$("#fees .txi_hodl").change(function(){ $("#fees .txi_hodl").on('input', function(){
var inputno = $('.'+$(this).attr('rel')+' .inputno',$(this).parent()).html(); var inputno = $('.'+$(this).attr('rel')+' .inputno',$("#fees .txinputs")).html();
$('.'+$(this).attr('rel')+' .bytes',$(this).parent()).html((inputno*$("#est_txi_hodl").val())+(inputno*41)); $('.'+$(this).attr('rel')+' .bytes',$("#fees .txinputs")).html((inputno*$("#est_txi_hodl").val())+(inputno*41));
mathFees(); mathFees();
}); });
$("#fees .txi_unknown").change(function(){ $("#fees .txi_unknown").on('input', function(){
var inputno = $('.'+$(this).attr('rel')+' .inputno',$(this).parent()).html(); var inputno = $('.'+$(this).attr('rel')+' .inputno',$("#fees .txinputs")).html();
$('.'+$(this).attr('rel')+' .bytes',$(this).parent()).html((inputno*$("#est_txi_unknown").val())+(inputno*41)); $('.'+$(this).attr('rel')+' .bytes',$("#fees .txinputs")).html((inputno*$("#est_txi_unknown").val())+(inputno*41));
mathFees(); 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(){ $("#advancedFeesCollapse").click(function(){
if($("#advancedFees").hasClass('hidden')){ if($("#advancedFees").hasClass('hidden')){
$("span",this).removeClass('glyphicon-collapse-down').addClass('glyphicon-collapse-up'); $("span",this).removeClass('glyphicon-collapse-down').addClass('glyphicon-collapse-up');

7
sha1sum
View file

@ -1,8 +1,8 @@
---- Version 1.3 2018.01.01 --- ---- Version 1.3 2018.01.03 ---
77e4519962e2f6a9fc93342137dbb31c33b76b04 ./js/aes.js 77e4519962e2f6a9fc93342137dbb31c33b76b04 ./js/aes.js
3a09a8fc0cfe828b57fc798d668234d0490ee1a6 ./js/bootstrap-datetimepicker.min.js 3a09a8fc0cfe828b57fc798d668234d0490ee1a6 ./js/bootstrap-datetimepicker.min.js
253711c6d825de55a8360552573be950da180614 ./js/bootstrap.min.js 253711c6d825de55a8360552573be950da180614 ./js/bootstrap.min.js
acd94783bcf56758633af126fc6742fe08db9f93 ./js/coinbin.js f43691b7db457598283d3b146f8b8545b2aa21a1 ./js/coinbin.js
31fbebf65d9cae8f26761cb057c4fb1b97339d08 ./js/coin.js 31fbebf65d9cae8f26761cb057c4fb1b97339d08 ./js/coin.js
988565bc2cb402d63ed5c5fd7ff47c4278efc2c5 ./js/collapse.js 988565bc2cb402d63ed5c5fd7ff47c4278efc2c5 ./js/collapse.js
9ba5ede3d7f9d4c8fd623395f196adfdcf7e970f ./js/crypto-min.js 9ba5ede3d7f9d4c8fd623395f196adfdcf7e970f ./js/crypto-min.js
@ -31,6 +31,5 @@ de51a8494180a6db074af2dee2383f0a363c5b08 ./fonts/glyphicons-halflings-regular.s
278e49a86e634da6f2a02f3b47dd9d2a8f26210f ./fonts/glyphicons-halflings-regular.woff 278e49a86e634da6f2a02f3b47dd9d2a8f26210f ./fonts/glyphicons-halflings-regular.woff
44bc1850f570972267b169ae18f1cb06b611ffa2 ./fonts/glyphicons-halflings-regular.ttf 44bc1850f570972267b169ae18f1cb06b611ffa2 ./fonts/glyphicons-halflings-regular.ttf
d8a324a13501cd5705dc26b945fc8088f00907ae ./README.md d8a324a13501cd5705dc26b945fc8088f00907ae ./README.md
bb129ea3d4df64994fa40a143791304f5cc2fc74 ./index.html 4cd31f66eafbf86e98def4db6ff1b13ba5dcf01a ./index.html