BTCPrivate
/
BarterDEX
mirror of https://github.com/BTCPrivate/BarterDEX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bugfix: after window refresh coin exchange wasn't selecting exact coin pairs

This commit is contained in:
satindergrewal 2017-12-08 02:52:14 +13:00
parent 276e7a9551
commit 514941d7e5
3 changed files with 25 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/bin/osx/marketmaker
View File

Binary file not shown.

6
gui/js/charts/Toolbar_html.js
View File

@ -2,7 +2,7 @@ var Toolbar_html = `
<div class="scxToolbar"> <div class="scxToolbar">
<input type="text" class="symbolSearch form-control" title="Selected instrument" style="display: none;"> <input type="text" class="symbolSearch form-control" title="Selected instrument" style="display: none;">
<div class="scxToolbarButton scxToolbarButtonWithDropdown scxTimeFramePicker" style="display: none;"> <div class="scxToolbarButton scxToolbarButtonWithDropdown scxTimeFramePicker">
<div class="scxToolbarButton-buttonWrapper" title="Time frame"> <div class="scxToolbarButton-buttonWrapper" title="Time frame">
<div class="scxToolbarButton-activateBtn"> <div class="scxToolbarButton-activateBtn">
<span class="scxTimeFramePicker-button-value"></span> <span class="scxTimeFramePicker-button-value"></span>
@ -13,7 +13,7 @@ var Toolbar_html = `
<div class="scxToolbarButton-dropdownWrapper scxTimeFramePickerDropDown"> <div class="scxToolbarButton-dropdownWrapper scxTimeFramePickerDropDown">
<div class="scxTimeFramePicker-dropdownContainer"> <div class="scxTimeFramePicker-dropdownContainer">
<div class="scxTimeFramePicker-ValuesWrapper"> <div class="scxTimeFramePicker-ValuesWrapper">
<div class="scxToolbarButton-dropdownElement" data-scxvalue="30" data-scxunits="s" title="30 seconds"> <div class="scxToolbarButton-dropdownElement" data-scxvalue="30" data-scxunits="s" title="30 seconds" style="display: none;">
<span class="scxToolbarButton-dropdownElement-value">30</span> <span class="scxToolbarButton-dropdownElement-value">30</span>
<span class="scxToolbarButton-dropdownElement-units">seconds</span> <span class="scxToolbarButton-dropdownElement-units">seconds</span>
</div> </div>
@ -58,7 +58,7 @@ var Toolbar_html = `
<span class="scxToolbarButton-dropdownElement-units">year</span> <span class="scxToolbarButton-dropdownElement-units">year</span>
</div> </div>
</div> </div>
<div class="scxTimeFramePicker-CustomValueWrapper"> <div class="scxTimeFramePicker-CustomValueWrapper" style="display: none;">
<button class="scxTimeFramePicker-CustomValueMinus btn btn-default" title="Decrease">-</button> <button class="scxTimeFramePicker-CustomValueMinus btn btn-default" title="Decrease">-</button>
<input class="scxTimeFramePicker-CustomValueText form-control" value="" type="text" title="Interval"> <input class="scxTimeFramePicker-CustomValueText form-control" value="" type="text" title="Interval">
<button class="scxTimeFramePicker-CustomValuePlus btn btn-default" title="Increase">+</button> <button class="scxTimeFramePicker-CustomValuePlus btn btn-default" title="Increase">+</button>

56
gui/js/simpledexactions.js
View File

@ -161,17 +161,6 @@ $('.porfolio_coins_list tbody').on('click', '.btn-portfoliogo', function() {
console.log('portfolio coin button clicked') console.log('portfolio coin button clicked')
console.log($(this).data()); console.log($(this).data());
console.log($(this).data('coin')); console.log($(this).data('coin'));
coin = $(this).data('coin');
selected_coin = {}
selected_coin.coin = $(this).data('coin');
selected_coin.coin_name = $(this).data('coinname');
selected_coin.addr = $(this).data('addr');
selected_coin.balance = $(this).data('balance');
console.log(selected_coin);
sessionStorage.setItem('mm_selectedcoin', JSON.stringify(selected_coin));
$('.screen-portfolio').hide(); $('.screen-portfolio').hide();
$('#trading_mode_options_trademanual').trigger('click'); $('#trading_mode_options_trademanual').trigger('click');
$('#trading_mode_options_tradebot').removeAttr("checked"); $('#trading_mode_options_tradebot').removeAttr("checked");
@ -197,12 +186,22 @@ $('.porfolio_coins_list tbody').on('click', '.btn-portfoliogo', function() {
$('.trading_coin_balance').empty(); $('.trading_coin_balance').empty();
$('#balance-spinner').show(); $('#balance-spinner').show();
coin = $(this).data('coin');
if (coin == 'KMD') { if (coin == 'KMD') {
$('.trading_pair_coin').selectpicker('val', 'BTC'); $('.trading_pair_coin').selectpicker('val', 'BTC');
$('.relvol_basevol_coin').html('BTC'); $('.relvol_basevol_coin').html('BTC');
setTimeout(function(){ $('.trading_pair_coin2').selectpicker('val', 'KMD'); }, 10); setTimeout(function(){ $('.trading_pair_coin2').selectpicker('val', 'KMD'); }, 10);
} }
selected_coin = {}
selected_coin.coin = $(this).data('coin');
selected_coin.coin_name = $(this).data('coinname');
selected_coin.addr = $(this).data('addr');
selected_coin.balance = $(this).data('balance');
console.log(selected_coin);
sessionStorage.setItem('mm_selectedcoin', JSON.stringify(selected_coin));
//check_coin_balance_Interval = setInterval(check_coin_balance($(this).data()),3000); //check_coin_balance_Interval = setInterval(check_coin_balance($(this).data()),3000);
$('.screen-portfolio').hide(); $('.screen-portfolio').hide();
@ -691,7 +690,7 @@ $('.btn-bot_action').click(function(e){
//manual_buy_sell(trade_data) //manual_buy_sell(trade_data)
buy_sell_precheck(trade_data); buy_sell_precheck(trade_data);
$('.trading_auto_repeat_trade_yesno').prop('checked', false); $('.trading_auto_repeat_trade_yesno').attr('checked', false);
} else if (bot_or_manual == 'tradeportfolio') { } else if (bot_or_manual == 'tradeportfolio') {
@ -2233,8 +2232,7 @@ $('.btn_set_coin_goal').click(function(e){
console.log('btn_set_coin_goal clicked'); console.log('btn_set_coin_goal clicked');
console.log($(this).data()); console.log($(this).data());
var selected_coin = JSON.parse(sessionStorage.getItem('mm_selectedcoin')); var coin = $('.trading_pair_coin2').selectpicker('val',coin);
var coin = selected_coin.coin;
console.log(coin); console.log(coin);
var goal_data = {} var goal_data = {}
@ -2278,8 +2276,7 @@ $('.btn-autogoalall').click(function(e){
function autoprice_buy_sell(autoprice_data) { function autoprice_buy_sell(autoprice_data) {
console.log(autoprice_data); console.log(autoprice_data);
var selected_coin = JSON.parse(sessionStorage.getItem('mm_selectedcoin')); var coin = $('.trading_pair_coin2').selectpicker('val',coin);
var coin = selected_coin.coin;
//console.log(coin); //console.log(coin);
var buying_or_selling = $('input[name=trading_pair_options]:checked').val(); var buying_or_selling = $('input[name=trading_pair_options]:checked').val();
@ -2493,8 +2490,7 @@ $('input[name=trading_mode_options]').change(function() {
function manual_buy_sell(mt_data) { function manual_buy_sell(mt_data) {
console.log(mt_data); console.log(mt_data);
var selected_coin = JSON.parse(sessionStorage.getItem('mm_selectedcoin')); var coin = $('.trading_pair_coin2').selectpicker('val',coin);
var coin = selected_coin.coin;
//console.log(coin); //console.log(coin);
var buying_or_selling = $('input[name=trading_pair_options]:checked').val(); var buying_or_selling = $('input[name=trading_pair_options]:checked').val();
@ -2638,8 +2634,7 @@ function CheckOrderBookFn(sig) {
console.log('checking orderbook'); console.log('checking orderbook');
} }
var selected_coin = JSON.parse(sessionStorage.getItem('mm_selectedcoin')); var coin = $('.trading_pair_coin2').selectpicker('val',coin);
var coin = selected_coin.coin;
console.log(coin); console.log(coin);
var buying_or_selling = $('input[name=trading_pair_options]:checked').val(); var buying_or_selling = $('input[name=trading_pair_options]:checked').val();
@ -2782,8 +2777,7 @@ function check_my_prices(sig){
console.log('checking my prices'); console.log('checking my prices');
} }
var selected_coin = JSON.parse(sessionStorage.getItem('mm_selectedcoin')); var coin = $('.trading_pair_coin2').selectpicker('val',coin);
var coin = selected_coin.coin;
console.log(coin); console.log(coin);
var buying_or_selling = $('input[name=trading_pair_options]:checked').val(); var buying_or_selling = $('input[name=trading_pair_options]:checked').val();
@ -3397,8 +3391,7 @@ function create_sendtx(coin,tx_data){
function update_min_max_price_input(){ function update_min_max_price_input(){
var selected_coin = JSON.parse(sessionStorage.getItem('mm_selectedcoin')); var coin = $('.trading_pair_coin2').selectpicker('val',coin);
var coin = selected_coin.coin;
console.log(coin); console.log(coin);
var buying_or_selling = $('input[name=trading_pair_options]:checked').val(); var buying_or_selling = $('input[name=trading_pair_options]:checked').val();
@ -3467,8 +3460,7 @@ function check_bot_list(sig) {
console.log('checking bot list'); console.log('checking bot list');
} }
var selected_coin = JSON.parse(sessionStorage.getItem('mm_selectedcoin')); var coin = $('.trading_pair_coin2').selectpicker('val',coin);
var coin = selected_coin.coin;
//console.log(coin); //console.log(coin);
var userpass = sessionStorage.getItem('mm_userpass'); var userpass = sessionStorage.getItem('mm_userpass');
@ -3583,8 +3575,7 @@ function check_bot_list(sig) {
} }
function buy_sell_precheck(bot_data){ function buy_sell_precheck(bot_data){
var selected_coin = JSON.parse(sessionStorage.getItem('mm_selectedcoin')); var coin = $('.trading_pair_coin2').selectpicker('val',coin);
var coin = selected_coin.coin;
//console.log(coin); //console.log(coin);
var buying_or_selling = $('input[name=trading_pair_options]:checked').val(); var buying_or_selling = $('input[name=trading_pair_options]:checked').val();
@ -3672,8 +3663,7 @@ function buy_sell_precheck(bot_data){
} }
function bot_buy_sell(bot_data) { function bot_buy_sell(bot_data) {
var selected_coin = JSON.parse(sessionStorage.getItem('mm_selectedcoin')); var coin = $('.trading_pair_coin2').selectpicker('val',coin);
var coin = selected_coin.coin;
//console.log(coin); //console.log(coin);
var buying_or_selling = $('input[name=trading_pair_options]:checked').val(); var buying_or_selling = $('input[name=trading_pair_options]:checked').val();
@ -4301,8 +4291,7 @@ function bot_screen_coin_balance(sig) {
console.log('checking bot screen coin balance'); console.log('checking bot screen coin balance');
} }
var selected_coin = JSON.parse(sessionStorage.getItem('mm_selectedcoin')); var coin = $('.trading_pair_coin2').selectpicker('val');
var coin = selected_coin.coin;
console.log(coin); console.log(coin);
var coin_name = return_coin_details(coin).name; var coin_name = return_coin_details(coin).name;
@ -4780,8 +4769,7 @@ function check_swap_status(sig) {
console.log('checking swap status'); console.log('checking swap status');
} }
var selected_coin = JSON.parse(sessionStorage.getItem('mm_selectedcoin')); var coin = $('.trading_pair_coin2').selectpicker('val',coin);
var coin = selected_coin.coin;
//console.log(coin); //console.log(coin);
var userpass = sessionStorage.getItem('mm_userpass'); var userpass = sessionStorage.getItem('mm_userpass');