diff --git a/.iron-node.js b/.iron-node.js index 00371b1..58dde0c 100644 --- a/.iron-node.js +++ b/.iron-node.js @@ -14,8 +14,8 @@ var settings = { "app": { "native+" : true, // DEFAULT=FALSE; extends require to search native modules respecting the current v8 engine version. "autoAddWorkSpace" : false, // DEFAULT=TRUE; disables the autoAddWorkSpace behavior. - "openDevToolsDetached" : false, // DEFAULT=FALSE; opens the dev tools windows detached in an own window. - "hideMainWindow" : false, // DEFAULT=FALSE; hides the main window to show dev tools only. + "openDevToolsDetached" : true, // DEFAULT=FALSE; opens the dev tools windows detached in an own window. + "hideMainWindow" : true, // DEFAULT=FALSE; hides the main window to show dev tools only. }, "workSpaceDirectory" : function(argv) { // determines the workspace directory for specific commandline applications. var result = ""; diff --git a/.jshintrc b/.jshintrc index 6daacef..ed963cf 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1,5 +1,5 @@ { - + "esversion": 6, "passfail" : false, "maxerr" : 100, "browser" : true, diff --git a/app/app.js b/app/app.js index bd204b4..474075b 100644 --- a/app/app.js +++ b/app/app.js @@ -1,10 +1,10 @@ var os = require('os'); var fs = require('fs'); var path = require('path'); -var remote = require('remote'); +var remote = require('electron').remote; var markdown = require('markdown').markdown; var packageController = require("package.js"); -var app = remote.require("app"); +var app = require('electron').remote.app var shell = require('electron').shell; var PrettyError = require('pretty-error'); var prettyError = new PrettyError(); diff --git a/app/config.js b/app/config.js index 7e93ab8..86ae90f 100644 --- a/app/config.js +++ b/app/config.js @@ -7,7 +7,7 @@ var app; try{ app = require("app"); } catch(e){ - app = require("remote").require("app"); + app = require('electron'); } var Config = function(argv) { diff --git a/app/index.js b/app/index.js index 00f2329..d2c11bc 100644 --- a/app/index.js +++ b/app/index.js @@ -1,7 +1,7 @@ -var app = require('app'); // Module to control application life. +const {app} = require('electron'); var path = require('path'); // Module to control application life. -var BrowserWindow = require('browser-window'); // Module to create native browser window. -var Mnu = require('./menu.js'); +const {BrowserWindow} = require('electron'); +var Mnu = require(path.join(__dirname, 'menu.js')); var fs = require('fs'); @@ -87,27 +87,22 @@ app.on('ready', function() { mainWindow.maximize(); - mainWindow.on('closed', function() { + mainWindow.webContents.on('closed', function() { mainWindow = null; }); - var devtoolsClosedFirstCall = true; // workaround - devtools-closed fired once devTools was opened? - mainWindow.on('devtools-closed', function() { - if (config.settings.app.hideMainWindow){ - if (!devtoolsClosedFirstCall){ - mainWindow.close(); - } - } - devtoolsClosedFirstCall = false; + mainWindow.webContents.on('devtools-closed', function() { + //app.quit(); + mainWindow.show(); }); - mainWindow.on('devtools-opened', function() { - setTimeout(function(){ + mainWindow.webContents.on('devtools-opened', function() { + //setTimeout(function(){ mainWindow.loadURL('file://' + __dirname + '/index.html'); if (config.settings.app.hideMainWindow){ mainWindow.hide(); } - }, 400); + //}, 400); }); mainWindow.openDevTools({detach : config.settings.app.openDevToolsDetached}); diff --git a/app/menu.js b/app/menu.js index 1c00d5e..258bc2b 100644 --- a/app/menu.js +++ b/app/menu.js @@ -1,8 +1,9 @@ var os = require('os'); -var Menu = require('menu'); +var remote = require('electron'); +const {Menu} = remote; var template = []; var SoftwareUpdate = require('./update.js'); -var app = require("app"); +const {app} = require('electron'); var path = require("path"); var fs = require("fs"); var shell = require('electron').shell; diff --git a/app/update.js b/app/update.js index 9aba9fb..1381d4e 100644 --- a/app/update.js +++ b/app/update.js @@ -1,5 +1,4 @@ -var dialog = require('dialog'); - +const {dialog} = require('electron'); var execute = function(cmd, done) { var exec = require('child_process').exec; exec(cmd, diff --git a/package.json b/package.json index 77b235b..2d3860b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iron-node", - "version": "2.2.17", + "version": "3.0.0", "description": "Debug Node.js code on the fly with Chrome Developer Tools on Linux, Windows and OS X.", "main": "index.js", "bin": { @@ -43,7 +43,7 @@ "dependencies": { "commander": "^2.9.0", "deep-extend": "^0.4.1", - "electron-prebuilt": "^0.37.8", + "electron-prebuilt": "^1.0.2", "electron-recompile": "^1.0.16", "markdown": "^0.5.0", "nmp": "^1.0.3",