Browse Source

fixed async false on init wallet loading

all-modes
Petr Balashov 8 years ago
parent
commit
adf11f300f
  1. 54
      gui/init.js
  2. 8
      gui/loading.js

54
gui/init.js

@ -7,35 +7,37 @@ $(document).ready(function() {
animation: 'pulse'
});
var appConf = GetAppConf();
$('#loading_status_text').text('Starting Iguana daemon...');
if (appConf && !appConf.manualIguanaStart) {
StartIguana();
}
GetAppConf(inititalWalletLoading);
var portcheck;
function startcheck() {
portcheck = setInterval(function(){
Iguana_activehandle().then(function(result){
console.log(result);
if (result !== 'error') {
stopcheck();
$('#loading_status_text').text('Connecting to Basilisk Network...');
EDEX_DEXgetinfoAll(appConf.skipBasiliskNetworkCheck, appConf.minNotaries);
}
})
//var check = Iguana_activehandle();
//console.log(check[0])
}, 2000);
}
function inititalWalletLoading(appConf) {
if (appConf && !appConf.manualIguanaStart) {
StartIguana();
}
function stopcheck() {
clearInterval(portcheck);
}
var portcheck;
startcheck();
function startcheck() {
portcheck = setInterval(function(){
Iguana_activehandle().then(function(result){
console.log(result);
if (result !== 'error') {
stopcheck();
$('#loading_status_text').text('Connecting to Basilisk Network...');
EDEX_DEXgetinfoAll(appConf.skipBasiliskNetworkCheck, appConf.minNotaries);
}
})
//var check = Iguana_activehandle();
//console.log(check[0])
}, 2000);
}
function stopcheck() {
clearInterval(portcheck);
}
startcheck();
}
});

8
gui/loading.js

@ -18,13 +18,15 @@ function Iguana_activehandle(callback) {
'agent': 'SuperNET',
'method': 'activehandle'
},
AjaxOutputData = IguanaAJAX('http://127.0.0.1:' + config.iguanaPort, ajax_data).done(function(data) {
AjaxOutputData = IguanaAJAX('http://127.0.0.1:7778', ajax_data).done(function(data) {
//$('#loading_status_text').text('Retrieving active handle...');
//console.log(AjaxOutputData.responseText);
AjaxOutputData = JSON.parse(AjaxOutputData.responseText)
//console.log(AjaxOutputData);
resolve(AjaxOutputData);
})
.fail(function(xhr, textStatus, error) {
// $('#loading_status_text').text('Retrieving active handle error!');
// handle request failures
console.log(xhr.statusText);
if ( xhr.readyState == 0 ) {
@ -63,7 +65,7 @@ function StartIguana() {
});
}
function GetAppConf() { // get iguana app conf
function GetAppConf(cb) { // get iguana app conf
var ajax_data = { 'herd': 'iguana' },
data = false;
@ -77,6 +79,7 @@ function GetAppConf() { // get iguana app conf
console.log('== App Conf Data OutPut ==');
console.log(_data);
data = _data;
cb.call(this, data);
})
.fail(function(xhr, textStatus, error) {
// handle request failures
@ -85,6 +88,7 @@ function GetAppConf() { // get iguana app conf
}
console.log(textStatus);
console.log(error);
cb.call(this, data);
});
return data;

Loading…
Cancel
Save