diff --git a/assets/scripts/dashboard.js b/assets/scripts/dashboard.js index 8b70357..5f5a328 100644 --- a/assets/scripts/dashboard.js +++ b/assets/scripts/dashboard.js @@ -47,14 +47,14 @@ var Dashboard = function() { $('#btn_edexcoin_send').click(function() { var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin"); //console.log(active_edexcoin); - + $('#edexcoin_dashboardinfo').hide(); $('#edexcoin_send').show(); $('#edexcoin_recieve').hide(); $('#edexcoin_recieve_section').hide(); $('#edexcoin_settings').hide(); - + //Disabled dropdown list address in EasyDEX's main send option, as it's using sendtoaddress at the moment. //This option can be enabled later for other section where user can select particular address to send funds from. /*var edexcoin_addr_list_with_balance = EDEXlistunspent(active_edexcoin); @@ -83,7 +83,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()); @@ -103,7 +103,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()); @@ -187,7 +187,7 @@ var Dashboard = function() { var handle_edex_recieve = function() { $('#btn_edexcoin_recieve').click(function() { var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin"); - //console.log('wallet recieve button clicked...'); + //console.log('wallet receive button clicked...'); $('#edexcoin_dashboardinfo').hide(); $('#edexcoin_dashoard_section').hide(); $('#edexcoin_send').hide(); @@ -203,7 +203,7 @@ var Dashboard = function() { console.log('get new T address button clicked...'); EDEXgetnewaddress(active_edexcoin); EdexListAllAddr(active_edexcoin); - toastr.info("Recieving Address list updated", "Wallet Notification"); + toastr.info("Receiving Address list updated", "Wallet Notification"); }); }; @@ -226,7 +226,7 @@ var Dashboard = function() { //console.log('== AllCoins Data OutPut =='); //console.log(value); //console.log(AllcoinsDataOutput[value]); - + $.each(AllcoinsDataOutput[value], function(index) { var coinlogo = ''; @@ -259,7 +259,7 @@ var Dashboard = function() { if ( AllcoinsDataOutput[value][index] == 'FRK' ) { coinlogo = 'franko'; coinname = 'Franko'; } //console.log(AllcoinsDataOutput[value][index]); - + walletDivContent += ''; walletDivContent += '
'; walletDivContent += '
'; @@ -299,16 +299,16 @@ var Dashboard = function() { } }); }); - + } var handleWalletWidgetBtns = function() { - + $('.mdl_addcoin_done_btn').click(function(){ ExecuteAddCoinFn(); }); - + } @@ -406,12 +406,12 @@ function edexCoinBtnAction() { $('#edexcoin_send').hide(); $('#edexcoin_recieve_section').hide(); $('#edexcoin_settings').hide(); - + //get selected coin's code and populate in easydex wallet widget's html elements var coincode = $(this).data('edexcoincode'); $.each($('[data-edexcoin]'), function(index, value) {$('[data-edexcoin]').attr("data-edexcoin",coincode); $('[data-edexcoin="'+coincode+'"]')}); $.each($('[data-edexcoinmenu]'), function(index, value) {$('[data-edexcoinmenu]').attr("data-edexcoinmenu",coincode); $('[data-edexcoinmenu="'+coincode+'"]')}); - + $('#edexcoin-active').text(coincode); //populate selected coin's address var coinmainaddr = EDEXMainAddr(coincode); @@ -459,7 +459,7 @@ function EdexfillTxHistory(coin) { select: true, retrieve: true }); - + NProgress.done(); } @@ -506,7 +506,7 @@ function ShowCoinHistory(getData) { //Calculate Total Fiat Value of BTC/BTCD in Fiat and disaply on Dashboard //TotalFiatValue(); - + var show_coin_history_unspents = CoinHistoryData.unspents[0]; //Store unspents array output in variable. var show_coin_history_spends = CoinHistoryData.spends[0]; //Store spends array output in variable. //var show_coin_history = testhistory; //Enable to get history from just test variable. @@ -514,7 +514,7 @@ function ShowCoinHistory(getData) { //console.log(show_coin_history_spends); //console.log(show_coin_history_unspents.length+show_coin_history_spends.length+show_coin_history_spends.length) - + //if ( sessionStorage.getItem('PrevHistoryLength_'+getData.vals['coin']) != CoinHistoryData.history.length ) { $.each(show_coin_history_unspents, function(coin_history_index){ //console.log(coin_history_index); @@ -585,7 +585,7 @@ function ShowCoinHistory(getData) { //sessionStorage.setItem('PrevHistoryLength_'+getData.vals['coin'], CoinHistoryData.history.length); }); //} - + //console.log(show_coin_history_spends.length); //$('span[data-currency="' + getData.vals['coin'] + '"][id="currency-nooftransactions"]').text(show_coin_history_spends.length); }, @@ -607,7 +607,7 @@ function ShowCoinHistory(getData) { $("#loginbtn").text('Unlock'); } } - + } function getCoinBalance(coin) { @@ -718,7 +718,7 @@ function TotalFiatValue() { $('span[data-currency="BTC"][id="header_coinname_balance"]').text(BTC_balance + ' BTC'); $('span[data-currency="BTCD"][id="header_coinname_balance"]').text(BTCD_balance + ' BTCD' ); - + if ( Fiat_Currency == 'USD' ) { BTC_Fiat_pair_value = 'BTC/'+Fiat_Currency; Conversion_Fiat_Pair = 'EUR/USD'; @@ -956,14 +956,14 @@ function EdexListAllAddr(coin) { select: false, retrieve: true }); - + edexcoin_recieve_table.destroy(); edexcoin_recieve_table = $('#edexcoin-recieve-addr-tbl').DataTable( { data: only_reciving_addr_data, select: false, retrieve: true }); - + NProgress.done(); return only_reciving_addr_data; -} \ No newline at end of file +} diff --git a/assets/scripts/kmd_wallet_dashboard.js b/assets/scripts/kmd_wallet_dashboard.js index 9b068cd..de8718e 100644 --- a/assets/scripts/kmd_wallet_dashboard.js +++ b/assets/scripts/kmd_wallet_dashboard.js @@ -53,7 +53,7 @@ var KMDWalletDashboard = function() { $('#kmd_wallet_send').show(); $('#kmd_wallet_recieve_section').hide(); $('#kmd_wallet_settings').hide(); - + var kmd_addr_list_with_balance = KMDlistunspentT(); //console.log(kmd_addr_list_with_balance); @@ -86,7 +86,7 @@ var KMDWalletDashboard = function() { $('#kmd_wallet_amount').keyup(function() { var sum_val1 = parseFloat($('#kmd_wallet_amount').val()) var sum_val2 = parseFloat($('#kmd_wallet_fee').val()) - var total_minus_currency_fee = sum_val1 - sum_val2; + var total_minus_currency_fee = sum_val1 - sum_val2; var mdl_send_btn = $('#kmd_wallet_send_coins_btn'); //console.log($('#kmd_wallet_amount').val()); @@ -106,7 +106,7 @@ var KMDWalletDashboard = function() { $('#kmd_wallet_fee').keyup(function() { var sum_val1 = parseFloat($('#kmd_wallet_amount').val()) var sum_val2 = parseFloat($('#kmd_wallet_fee').val()) - var total_minus_currency_fee = sum_val1 - sum_val2; + var total_minus_currency_fee = sum_val1 - sum_val2; var mdl_send_btn = $('#kmd_wallet_send_coins_btn'); //console.log($('#kmd_wallet_amount').val()); @@ -222,14 +222,14 @@ var KMDWalletDashboard = function() { console.log('get new T address button clicked...'); KMDGetNewAddresses('public'); KMDListAllAddr(); - toastr.info("Recieving Address list updated", "Wallet Notification"); + toastr.info("Receiving Address list updated", "Wallet Notification"); }); - + $('#kmd_get_new_zaddr').click(function() { console.log('get new Z address button clicked...'); KMDGetNewAddresses('private'); KMDListAllAddr(); - toastr.info("Recieving Address list updated", "Wallet Notification"); + toastr.info("Receiving Address list updated", "Wallet Notification"); }); }; @@ -265,7 +265,7 @@ function RunKMDInitFunctions() { template: '
' }); NProgress.start(); - + var check1 = CheckIfConnected(); console.log(check1[0]); if ( check1[0] == 'not active' ) { @@ -517,7 +517,7 @@ function KMDlistunspentT() { //console.log('== Data OutPut =='); //console.log(AjaxOutputData); var unique_addresses = _.keys(_.countBy(AjaxOutputData, function(data) { return data.address; })); //This code using undscore.js takes only the address into an array which are unique in that list - + // This function calls each unique address and calculates the total amount of coins in it. $.each(unique_addresses, function(index) { //console.log(unique_addresses[index]); @@ -569,7 +569,7 @@ function KMDListaddrZ() { //console.log('== Data OutPut of z_listaddresses =='); //console.log(AjaxOutputData); //This code gets list of all z_addresses into an array - + // This function calls each address and then gets the total amount of coins in it. $.each(AjaxOutputData, function(index, value) { //console.log(value); @@ -703,11 +703,11 @@ function KMDGetProtectedTransactions() { $.each(get_zaddr_list, function(index, value) { //console.log(value.addr); - + var ajax_data_to_hex = '["'+ value.addr +'",0]' var tmpzaddr_hex_input = Iguana_HashHex(ajax_data_to_hex) //console.log(tmpzaddr_hex_input); - + var passthru_agent = getPassthruAgent(); var ajax_data = {"agent":passthru_agent,"method":"passthru","function":"z_listreceivedbyaddress","hex":tmpzaddr_hex_input} //console.log(ajax_data); @@ -737,8 +737,8 @@ function KMDGetProtectedTransactions() { tmp_addr = ' Z Address not listed by wallet!' }*/ - - + + tmplistZtransactions = [' private',tmp_category,tmp_confirmations,tmp_amount,tmp_secondsToString,tmp_addr,''] //console.log(tmplistZtransactions); result.push(tmplistZtransactions); @@ -784,7 +784,7 @@ function KMDfillTxHistoryT() { select: true, retrieve: true }); - + NProgress.done(); } @@ -808,9 +808,9 @@ function KMDListAddresses(pubpriv) { ajax_function_input = 'z_listaddresses'; tmplistaddr_hex_input = ""; } - + //console.log(tmpzaddr_hex_input); - + var passthru_agent = getPassthruAgent(); var ajax_data = {"agent":passthru_agent,"method":"passthru","function":ajax_function_input,"hex":tmplistaddr_hex_input} //console.log(ajax_data); @@ -857,7 +857,7 @@ function KMDGetNewAddresses(pubpriv) { if ( pubpriv === 'private' ) { ajax_function_input = 'z_getnewaddress'; } - + var passthru_agent = getPassthruAgent(); var ajax_data = {"agent":passthru_agent,"method":"passthru","function":ajax_function_input,"hex":""} //console.log(ajax_data); @@ -915,14 +915,14 @@ function KMDListAllAddr() { select: false, retrieve: true }); - + kmd_recieve_table.destroy(); kmd_recieve_table = $('#kmd-recieve-addr-tbl').DataTable( { data: only_reciving_addr_data, select: false, retrieve: true }); - + NProgress.done(); return only_reciving_addr_data; } @@ -1020,13 +1020,13 @@ function KMDListAllOPIDs() { var tmp_status_label = ''; var tmp_creation_time = ''; var tmp_id = ''; - + console.log(listOPIDs); $.each(listOPIDs[0], function(index, value) { tmp_id = listOPIDs[0][index].id; tmp_creation_time = secondsToString(listOPIDs[0][index].creation_time); - + if (listOPIDs[0][index].status === 'queued') { tmp_status_label = ' Queued'; tmp_results = 'Please press refresh button in a minute or so to see updated status...'; @@ -1060,7 +1060,7 @@ function KMDListAllOPIDs() { select: false, retrieve: true }); - + kmd_opids_statuses_table.destroy(); kmd_opids_statuses_table = $('#kmd-opid-status-tbl').DataTable( { data: opids_statuses_data, @@ -1068,8 +1068,8 @@ function KMDListAllOPIDs() { select: false, retrieve: true }); - - + + NProgress.done(); return opids_statuses_data; } @@ -1152,7 +1152,7 @@ function CheckIfConnected() { } else { result.push(AjaxOutputData.errors); } - + }, error: function(xhr, textStatus, error) { console.log('failed getting Coin History.'); @@ -1189,7 +1189,7 @@ function CheckIfWalletEncrypted() { } else { result.push(AjaxOutputData.error); } - + }, error: function(xhr, textStatus, error) { console.log('failed getting Coin History.'); @@ -1202,4 +1202,4 @@ function CheckIfWalletEncrypted() { } }); return result; -} \ No newline at end of file +} diff --git a/index.html b/index.html index 73a1e4c..b4658cd 100755 --- a/index.html +++ b/index.html @@ -52,7 +52,7 @@ - +