Browse Source

fixed main window show bug when switching os applications

all-modes
Petr Balashov 8 years ago
parent
commit
20a2b1d96d
  1. 2
      gui/loading.js
  2. 11
      main.js

2
gui/loading.js

@ -156,6 +156,7 @@ function EDEX_DEXgetinfoAll(skip, minNotaries) {
if ( tmp_index == minNotaries ) { if ( tmp_index == minNotaries ) {
console.log('min notaries connected'); console.log('min notaries connected');
window.createWindow('open');
window.hide(); window.hide();
} }
}).fail(function(xhr, textStatus, error) { }).fail(function(xhr, textStatus, error) {
@ -170,6 +171,7 @@ function EDEX_DEXgetinfoAll(skip, minNotaries) {
}); });
}); });
} else { } else {
window.createWindow('open');
window.hide(); window.hide();
} }
} }

11
main.js

@ -62,14 +62,10 @@ process.once('loaded', () => {
}); });
guiapp.use(bodyParser.json({ limit: '50mb' })); // support json encoded bodies guiapp.use(bodyParser.json({ limit: '50mb' })); // support json encoded bodies
<<<<<<< HEAD
guiapp.use(bodyParser.urlencoded({ limit: '50mb', extended: true })); // support encoded bodies
=======
guiapp.use(bodyParser.urlencoded({ guiapp.use(bodyParser.urlencoded({
limit: '50mb', limit: '50mb',
extended: true extended: true
})); // support encoded bodies })); // support encoded bodies
>>>>>>> 7486433f111614db47f4d49f4a2a77ecd5bfcd68
guiapp.get('/', function (req, res) { guiapp.get('/', function (req, res) {
res.send('Iguana app server'); res.send('Iguana app server');
@ -179,7 +175,6 @@ fs.copy(iguanaConfsDirSrc, iguanaConfsDir, function (err) {
let mainWindow; let mainWindow;
let loadingWindow; let loadingWindow;
var isMainWindowExist;
function createLoadingWindow() { function createLoadingWindow() {
mainWindow = null; mainWindow = null;
@ -192,6 +187,8 @@ function createLoadingWindow() {
icon: iguanaIcon icon: iguanaIcon
}); });
loadingWindow.createWindow = createWindow; // expose createWindow to front-end scripts
// load our index.html (i.e. easyDEX GUI) // load our index.html (i.e. easyDEX GUI)
loadingWindow.loadURL('http://' + appConfig.host + ':' + appConfig.iguanaAppPort + '/gui/'); loadingWindow.loadURL('http://' + appConfig.host + ':' + appConfig.iguanaAppPort + '/gui/');
@ -203,8 +200,6 @@ function createLoadingWindow() {
// our app does not have multiwindow - so we dereference the window object instead of // our app does not have multiwindow - so we dereference the window object instead of
// putting them into an window_arr // putting them into an window_arr
loadingWindow = null; loadingWindow = null;
createWindow('open');
isMainWindowExist = true;
}); });
//ca333 todo - add os detector to use correct binary - so we can use the same bundle on ALL OS platforms //ca333 todo - add os detector to use correct binary - so we can use the same bundle on ALL OS platforms
@ -230,7 +225,7 @@ function createLoadingWindow() {
app.on('ready', createLoadingWindow); app.on('ready', createLoadingWindow);
function createWindow (status) { function createWindow (status) {
if ( status === 'open' && !isMainWindowExist) { if ( status === 'open') {
require(path.join(__dirname, 'private/mainmenu')); require(path.join(__dirname, 'private/mainmenu'));
// initialise window // initialise window

Loading…
Cancel
Save