Merge pull request electron#237 from electron/autoinstall-devtron

Jessica Lord · web-flow · commit 42106df68533 · 2016-09-07T11:29:18.000-07:00
add devtron to dev tools automatically in development
diff --git a/main.js b/main.js
@@ -37,6 +37,7 @@ function initialize () {
     if (debug) {
       mainWindow.webContents.openDevTools()
       mainWindow.maximize()
+      require('devtron').install()
     }
 
     mainWindow.on('closed', function () {
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
   "devDependencies": {
     "chai": "^3.4.1",
     "chai-as-promised": "^5.1.0",
-    "devtron": "^1.0.0",
+    "devtron": "^1.3.0",
     "electron-packager": "^7.0.1",
     "electron-prebuilt": "^1.2.6",
     "electron-windows-store": "^0.3.0",

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ function initialize () {`
`37`	`37`	`if (debug) {`
`38`	`38`	`mainWindow.webContents.openDevTools()`
`39`	`39`	`mainWindow.maximize()`
	`40`	`+ require('devtron').install()`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`mainWindow.on('closed', function () {`