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

fixed native mode started as full mode bug

master
pbca26 8 years ago
parent
c5be7f5f14
commit
b9582978ab
2 changed files with 9 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      assets/scripts/iguana_api/IguanaAddcoin.js
  2. 10
      assets/scripts/login.js

5
assets/scripts/iguana_api/IguanaAddcoin.js
View File

@ -1,6 +1,8 @@
// TODO: refactor // TODO: refactor
function Iguana_addcoin(addcoin_data) { function Iguana_addcoin(addcoin_data) {
console.log('addcoin data');
console.log(addcoin_data);
var tmpPendValue = sessionStorage.getItem('IguanaPendValue'); var tmpPendValue = sessionStorage.getItem('IguanaPendValue');
if (addcoin_data.coin !== 'BTC' && addcoin_data.coin !== 'LTC' && addcoin_data.coin !== 'DOGE') { if (addcoin_data.coin !== 'BTC' && addcoin_data.coin !== 'LTC' && addcoin_data.coin !== 'DOGE') {
@ -123,6 +125,7 @@ function Iguana_addcoin(addcoin_data) {
AddCoinData = {'userpass':tmpIguanaRPCAuth,"RELAY":addcoin_data.mode,"VALIDATE":addcoin_data.mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"services":129,"prefetchlag":-1,"poll":10,"active":1,"agent":"iguana","method":"addcoin","maxpeers":256,"newcoin":"ZET","name":"Zetacoin","netmagic":"fab503df","p2p":17333,"rpc":17335,"pubval":80,"p2shval":9,"wifval":224,"txfee_satoshis":"10000","minconfirms":2,"genesishash":"000006cab7aa2be2da91015902aa4458dd5fbb8778d175c36d429dc986f2bff4","genesis":{"version":1,"timestamp":1375548986,"nBits":"1e0fffff","nonce":2089928209,"merkle_root":"d0227b8c3e3d07bce9656b3d9e474f050d23458aaead93357dcfdac9ab9b79f9"},"alertpubkey":"045337216002ca6a71d63edf062895417610a723d453e722bf4728996c58661cdac3d4dec5cecd449b9086e9602b35cc726a9e0163e1a4d40f521fbdaebb674658"} AddCoinData = {'userpass':tmpIguanaRPCAuth,"RELAY":addcoin_data.mode,"VALIDATE":addcoin_data.mode,"startpend":tmpPendValue,"endpend":tmpPendValue,"services":129,"prefetchlag":-1,"poll":10,"active":1,"agent":"iguana","method":"addcoin","maxpeers":256,"newcoin":"ZET","name":"Zetacoin","netmagic":"fab503df","p2p":17333,"rpc":17335,"pubval":80,"p2shval":9,"wifval":224,"txfee_satoshis":"10000","minconfirms":2,"genesishash":"000006cab7aa2be2da91015902aa4458dd5fbb8778d175c36d429dc986f2bff4","genesis":{"version":1,"timestamp":1375548986,"nBits":"1e0fffff","nonce":2089928209,"merkle_root":"d0227b8c3e3d07bce9656b3d9e474f050d23458aaead93357dcfdac9ab9b79f9"},"alertpubkey":"045337216002ca6a71d63edf062895417610a723d453e722bf4728996c58661cdac3d4dec5cecd449b9086e9602b35cc726a9e0163e1a4d40f521fbdaebb674658"}
} }
if ( addcoin_data.coin == 'KMD' ) { if ( addcoin_data.coin == 'KMD' ) {
console.log(addcoin_data.mode);
logincoinfullname = 'Komodo'; logincoinfullname = 'Komodo';
if ( addcoin_data.mode == '1' ) { logincoinmodeinfo = 'Full'; } if ( addcoin_data.mode == '1' ) { logincoinmodeinfo = 'Full'; }
@ -1093,7 +1096,7 @@ function Iguana_addcoin(addcoin_data) {
} }
function GenericExecuteAddCoin(withLogin) { function GenericExecuteAddCoin(withLogin) {
var addcoin_selected_mode_val = $('input[name="addcoin_select_mode_mdl"]:checked').val(), var addcoin_selected_mode_val = $('input[name="addcoin_select_mode_mdl' + (withLogin ? '-login' : '') + '"]:checked').val(),
addcoin_selected_coinname_code_val = $('option:selected', '#addcoin_select_coin_mdl_options' + (withLogin ? '-login' : '')).val(), addcoin_selected_coinname_code_val = $('option:selected', '#addcoin_select_coin_mdl_options' + (withLogin ? '-login' : '')).val(),
ExecAddCoinData = { ExecAddCoinData = {
'coin': addcoin_selected_coinname_code_val, 'coin': addcoin_selected_coinname_code_val,

10
assets/scripts/login.js
View File

@ -423,7 +423,7 @@ var Login = function() {
) )
.show(); .show();
$('#logint-another-wallet').hide(); $('#logint-another-wallet').hide();
$("#loginbtn").text(_lang[defaultLang].LOGIN.SIGN_IN); $('#loginbtn').text(_lang[defaultLang].LOGIN.SIGN_IN);
//Stop SetInterval Calls //Stop SetInterval Calls
StopShowCoinHistory(); StopShowCoinHistory();
@ -590,7 +590,7 @@ var Login = function() {
'#section-login-addcoin-btn' '#section-login-addcoin-btn'
) )
.hide(); .hide();
$("#loginbtn").text(_lang[defaultLang].LOGIN.UNLOCK); $('#loginbtn').text(_lang[defaultLang].LOGIN.UNLOCK);
$('#section-login').show(); $('#section-login').show();
} }
} }
@ -731,7 +731,7 @@ var Login = function() {
) )
.show(); .show();
$('#logint-another-wallet').hide(); $('#logint-another-wallet').hide();
$("#loginbtn").text(_lang[defaultLang].LOGIN.SIGN_IN); $('#loginbtn').text(_lang[defaultLang].LOGIN.SIGN_IN);
} else { } else {
// If something goes wrong, alert the error message that our service returned // If something goes wrong, alert the error message that our service returned
toastr.warning(_lang[defaultLang].TOASTR.OPPS, _lang[defaultLang].TOASTR.ACCOUNT_NOTIFICATION); toastr.warning(_lang[defaultLang].TOASTR.OPPS, _lang[defaultLang].TOASTR.ACCOUNT_NOTIFICATION);
@ -768,7 +768,7 @@ var Login = function() {
ExecuteAddCoinLoginFn(); ExecuteAddCoinLoginFn();
}); });
$( "#addcoin_select_coin_mdl_options-login" ) $( '#addcoin_select_coin_mdl_options-login' )
.change(function() { .change(function() {
var tmp_coin_val = $('#addcoin_select_coin_mdl_options-login').val(); var tmp_coin_val = $('#addcoin_select_coin_mdl_options-login').val();
@ -943,5 +943,5 @@ function ClearOnLogout(cleardata, stopinterval) {
) )
.show(); .show();
$('#logint-another-wallet').hide(); $('#logint-another-wallet').hide();
$("#loginbtn").text(_lang[defaultLang].LOGIN.SIGN_IN); $('#loginbtn').text(_lang[defaultLang].LOGIN.SIGN_IN);
} }
Write Preview
Loading…
Cancel
Save