masq
/
glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #927 from 20after4/multi-devtools 

dev toools: separate shortcut for electron and for web content
This commit is contained in:
Lorenz Hübschle-Schneider 2017-04-07 12:38:43 +02:00 committed by GitHub
parent b448bb563b cca80cd992
commit 45edc0d3a5
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
electron-main.js
View File

@ -9,7 +9,6 @@
const Menu = require('electron').Menu; const Menu = require('electron').Menu;
// Node fs module // Node fs module
const fs = require("fs"); const fs = require("fs");
var template; var template;
template = [ template = [
@ -76,7 +75,20 @@
} }
}, },
{ {
label: 'Toggle Developer Tools', label: 'Electron Developer Tools',
accelerator: (function() {
if (process.platform == 'darwin')
return 'Alt+Command+E';
else
return 'Ctrl+Shift+E';
})(),
click: function(item, focusedWindow) {
if (focusedWindow)
focusedWindow.toggleDevTools();
}
},
{
label: 'Web Developer Tools',
accelerator: (function() { accelerator: (function() {
if (process.platform == 'darwin') if (process.platform == 'darwin')
return 'Alt+Command+I'; return 'Alt+Command+I';
@ -84,10 +96,11 @@
return 'Ctrl+Shift+I'; return 'Ctrl+Shift+I';
})(), })(),
click: function(item, focusedWindow) { click: function(item, focusedWindow) {
if (focusedWindow) if ( focusedWindow ) {
focusedWindow.toggleDevTools(); focusedWindow.webContents.send( 'openDevTools' );
}
} }
}, }
] ]
}, },
{ {
@ -183,7 +196,6 @@
}); });
app.on('ready', function() { app.on('ready', function() {
var menu = Menu.buildFromTemplate(template); var menu = Menu.buildFromTemplate(template);
Menu.setApplicationMenu(menu); Menu.setApplicationMenu(menu);
const initPath = __dirname + "/init.json"; const initPath = __dirname + "/init.json";
@ -197,7 +209,7 @@
console.log('Unable to read init.json: ', e); console.log('Unable to read init.json: ', e);
} }
const bounds = (data && data.bounds) ? data.bounds : {width: 1280, height:800 }; const bounds = (data && data.bounds) ? data.bounds : {width: 1280, height:800 };
var bwdata = {width: bounds.width, height: bounds.height, 'min-width': 1024, 'min-height': 600, 'autoHideMenuBar': true, 'web-security': true, 'java': false, 'accept-first-mouse': true, defaultEncoding: 'UTF-8', 'icon':'file://'+__dirname + '/assets/img/favicon.png'} var bwdata = {width: bounds.width, height: bounds.height, 'min-width': 1024, 'min-height': 600, 'autoHideMenuBar': true, 'web-security': true, 'java': false, 'accept-first-mouse': true, defaultEncoding: 'UTF-8', 'icon':'file://'+__dirname + '/assets/img/favicon.png'};
// Remembe window position // Remembe window position
if (data && data.bounds.x && data.bounds.y) { if (data && data.bounds.x && data.bounds.y) {
bwdata.x = data.bounds.x; bwdata.x = data.bounds.x;

4
electron-start.html
View File

@ -24,6 +24,10 @@ onload = function() {
webview.addEventListener("new-window", handlenewwindow); webview.addEventListener("new-window", handlenewwindow);
webview.addEventListener("page-title-set", handletitleset); webview.addEventListener("page-title-set", handletitleset);
ipc.on('openDevTools', function() {
setTimeout(function() { webview.openDevTools(); }, 0 );
});
ipc.on('browser-window-focus', function() { ipc.on('browser-window-focus', function() {
setTimeout(function() { webview.focus(); }, 0); setTimeout(function() { webview.focus(); }, 0);
setTimeout(function() { webview.executeJavaScript("document.getElementById(\"sendMessage\").focus();") }, 0); setTimeout(function() { webview.executeJavaScript("document.getElementById(\"sendMessage\").focus();") }, 0);