lukechilds
/
EasyDEX-GUI
mirror of https://github.com/lukechilds/EasyDEX-GUI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

experimental commit to fix issue with double clicking send button

master
Satinder Grewal 8 years ago
parent
de8af421d0
commit
65bd9135ef
3 changed files with 52 additions and 5 deletions
Split View
  1. 16
      assets/scripts/dashboard.js
  2. 1
      assets/scripts/iguana_api.js
  3. 40
      index.html

16
assets/scripts/dashboard.js
View File

@ -64,6 +64,7 @@ var Dashboard = function() {
$('#edex_total_balance').text('0');
}
}
EdexfillTxHistory(active_edexcoin);
//getCoinBalance(active_edexcoin);
//EdexfillTxHistory(active_edexcoin);
//clearEdexSendFieldData();
@ -99,8 +100,11 @@ var Dashboard = function() {
$('.showedexcoinaddrs').selectpicker('refresh');*/
//clearEdexSendFieldData();
$('.edexcoin-send-form')[0].reset();
tmp_coinkbfee = EDEXgetinfo(active_edexcoin);
$('#edexcoin_fee').val(tmp_coinkbfee[0].kbfee)
var selected_coinmode = sessionStorage.getItem('edexTmpMode')
if ( selected_coinmode == 'Full' ) {
tmp_coinkbfee = EDEXgetinfo(active_edexcoin);
$('#edexcoin_fee').val(tmp_coinkbfee[0].kbfee)
}
});
@ -113,7 +117,7 @@ var Dashboard = function() {
$('#edexcoin_amount').keyup(function() {
var sum_val1 = parseFloat($('#edexcoin_amount').val())
var sum_val2 = parseFloat($('#edexcoin_fee').val())
var total_minus_currency_fee = sum_val1 + sum_val2;
var total_minus_currency_fee = sum_val1 - sum_val2;
var mdl_send_btn = $('#edexcoin_send_coins_btn');
//console.log($('#edexcoin_amount').val());
@ -133,7 +137,7 @@ var Dashboard = function() {
$('#edexcoin_fee').keyup(function() {
var sum_val1 = parseFloat($('#edexcoin_amount').val())
var sum_val2 = parseFloat($('#edexcoin_fee').val())
var total_minus_currency_fee = sum_val1 + sum_val2;
var total_minus_currency_fee = sum_val1 - sum_val2;
var mdl_send_btn = $('#edexcoin_send_coins_btn');
//console.log($('#edexcoin_amount').val());
@ -207,6 +211,7 @@ var Dashboard = function() {
$('#mdl_confirm_currency_sendfrom_addr').text(coinmainaddr);
$('#mdl_confirm_currency_sendfrom_total_dedcut').text($('#edexcoin_total_value').text());
$('#mdl_confirm_currency_coinname_total').text($('[data-edexcoin]').attr("data-edexcoin"));
$('#SendCoinModelStep2').modal('show')
console.log('==> Before confirming tx to send')
@ -219,6 +224,7 @@ var Dashboard = function() {
//var tmp_send_from_addr = $('#edexcoin_send_from').val();
var tmp_send_to_addr = $('#edexcoin_sendto').val();
var tmp_send_total_amount = $('#edexcoin_total_value').text();
$('.edexcoin-send-form')[0].reset();
$('#edexcoin_send_coins_btn').click(function() {
console.log('==> After confirming tx to send')
@ -1249,6 +1255,7 @@ function ShowCoinProgressBar(coin) {
$('div[data-edexcoin="'+coin+'"][id="currency-bundles"]').removeClass( "progress-bar-info" ).addClass( "progress-bar-indicating progress-bar-success" );
$('#edex-footer').css("height", "11px");
resizeDashboardWindow();
$('#edexcoin-wallet-waitingrt-alert').hide()
//getCoinBalance(coin);
//EdexfillTxHistory(coin);
}
@ -1270,6 +1277,7 @@ function ShowCoinProgressBar(coin) {
$('span[data-edexcoin="'+coin+'"][id="currency-validated-percent"]').text('('+coin+') '+parseFloat(CoinInfoData.validated).toFixed(2)+'%');
$('#edex-footer').css("height", "44px");
resizeDashboardWindow();
$('#edexcoin-wallet-waitingrt-alert').show()
}
}
},

1
assets/scripts/iguana_api.js
View File

@ -680,7 +680,6 @@ function EDEXSendToAddr(data) {
}
});
$('#SendCoinModelStep2').modal('hide')
$('.edexcoin-send-form')[0].reset();
//$( "#btn_edexcoin_dashboard" ).trigger( "click" );
//$('#edexcoin_sendto_result tbody').html('');
return result;

40
index.html
View File

@ -682,6 +682,17 @@
<!-- End page header -->
<div class="" id="wallet-widgets" data-plugin="masonry" data-edexcoin="COIN" style="display: none;">
<div class="col-xs-12">
<div class="col-xs-12">
<div role="alert" class="alert alert-info alert-dismissible" data-edexcoin="COIN" id="edexcoin-wallet-waitingrt-alert" style="display: none;">
<button aria-label="Close" data-dismiss="alert" class="close" type="button"><span aria-hidden="true">×</span></button>
<h4>Activating wallet once Real Time blocks starts syncing...</h4>
<p data-edexcoin="COIN" id="edexcoin-wallet-waitingrt-alert-text">Iguana Full Mode coin synchronizes blockchain in entirely different format than traditional blockchain software. Iguana's Full Mode uses instead of Memory Mapped Files and stores data in bundles. That's why you see four different colored synchronizing progress bars.</p>
<p>Once all these progress bars reaches 100%, the Real Time blocks start synchronizing. Only after getting Real Time sync mode activates you'll be able to see Any data in your wallet and make any transactions.</p>
<p style="font-weight: 600">Please wait for all other progress bars to disappear and the first blue bar turned to green.<br>That would mean the wallet is in Real Time Sync mode.</p>
</div>
</div>
<div class="col-lg-12 col-xs-12" data-edexcoin="COIN" id="edexcoin_getbalance_t">
<!-- EasyDEX Total Balance Widget-->
<div class="widget widget-shadow" id="widgetLineareaOne">
@ -794,6 +805,35 @@
<!-- EasyDEX Panel send -->
<!-- Example Default -->
<div class="example-wrap">
<div class="example">
<div class="steps row">
<div class="step col-md-4">
<span class="step-number">1</span>
<div class="step-desc">
<span class="step-title">Shopping</span>
<p>Choose what you want</p>
</div>
</div>
<div class="step col-md-4 current">
<span class="step-number">2</span>
<div class="step-desc">
<span class="step-title">Billing</span>
<p>Pay for the bill</p>
</div>
</div>
<div class="step col-md-4">
<span class="step-number">3</span>
<div class="step-desc">
<span class="step-title">Getting</span>
<p>Waiting for the goods</p>
</div>
</div>
</div>
</div>
</div>
<!-- End Example Default -->
<div class="panel" id="projects">
<div class="panel-heading">
<h3 data-edexcoin="COIN" class="panel-title">Send <span data-edexcoin="COIN"></span></h3>

Write Preview
Loading…
Cancel
Save