Browse Source

config api update

ca333-dev
Petr Balashov 8 years ago
parent
commit
e4be1756ec
  1. 11
      gui/index.html
  2. 11
      gui/loading.js

11
gui/index.html

@ -28,7 +28,7 @@
});
const remote = require('electron').remote;
var window = remote.getCurrentWindow();
$('#loading_status_text').text('Starting Iguana daemon...')
$('#loading_status_text').text('Starting Iguana daemon...');
var appConf = GetAppConf();
if (appConf && !appConf.manualIguanaStart) {
@ -43,9 +43,9 @@
console.log(result)
if (result !== 'error') {
stopcheck();
$('#loading_status_text').text('Connecting to Basilisk Network...')
EDEX_DEXgetinfoAll()
//window.close();
$('#loading_status_text').text('Connecting to Basilisk Network...');
EDEX_DEXgetinfoAll();
window.close();
}
})
//var check = Iguana_activehandle();
@ -59,8 +59,7 @@
sartcheck();
//setTimeout(function(){ window.close(); }, 15000);
} else {
$('#loading_status_text').text(appConf)
//window.close();
window.close();
}
});
</script>

11
gui/loading.js

@ -65,15 +65,16 @@ function StartIguana() {
function GetAppConf() { // get iguana app conf
var ajax_data = {"herd":"iguana"};
var data = false;
console.log(ajax_data);
$.ajax({
async: false,
type: 'GET',
url: 'http://127.0.0.1:17777/shepherd/appconf'
}).done(function(data) {
}).done(function(_data) {
console.log('== App Conf Data OutPut ==');
console.log(data);
return data;
console.log(_data);
data = _data;
}).fail(function(xhr, textStatus, error) {
// handle request failures
console.log(xhr.statusText);
@ -81,9 +82,9 @@ function GetAppConf() { // get iguana app conf
}
console.log(textStatus);
console.log(error);
return false;
});
return data;
}
function EDEX_DEXnotarychains() {

Loading…
Cancel
Save