if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/symphonyoss/SymphonyElectron

Browse Source
This commit is contained in:
Vishwas Shashidhar
2018-03-29 15:56:30 +05:30
parent b24cbd7791 e449ece7bf
commit 8cb4382606
5 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/menus/menuTemplate.js
View File

@@ -80,15 +80,6 @@ const template = [{
}
}
},
{
label: 'Toggle Developer Tools',
accelerator: isMac ? 'Alt+Command+I' : 'Ctrl+Shift+I',
click(item, focusedWindow) {
if (focusedWindow) {
focusedWindow.webContents.toggleDevTools();
}
}
},
{
label: 'Set Downloads Directory',
click() {

22
js/windowMgr.js
View File

@@ -3,6 +3,7 @@
const fs = require('fs');
const electron = require('electron');
const app = electron.app;
const globalShortcut = electron.globalShortcut;
const crashReporter = electron.crashReporter;
const BrowserWindow = electron.BrowserWindow;
const path = require('path');
@@ -230,6 +231,7 @@ function doCreateMainWindow(initialUrl, initialBounds, isCustomTitleBar) {
});
});
registerShortcuts();
handlePermissionRequests(mainWindow.webContents);
addWindowKey(key, mainWindow);
@@ -511,7 +513,25 @@ function doCreateMainWindow(initialUrl, initialBounds, isCustomTitleBar) {
});
});
// ELECTRON-323: Handle session permission requests
/**
* Register shortcuts for the app
*/
function registerShortcuts() {
// Register dev tools shortcut
globalShortcut.register(isMac ? 'Alt+Command+I' : 'Ctrl+Shift+I', () => {
let focusedWindow = BrowserWindow.getFocusedWindow();
if (focusedWindow && !focusedWindow.isDestroyed()) {
focusedWindow.webContents.toggleDevTools();
}
});
}
/**
* Sets permission requests for the window
* @param webContents Web contents of the window
*/
function handlePermissionRequests(webContents) {
let session = webContents.session;

6
tests/spectron/alwaysOnTop.spectron.js
View File

@@ -138,9 +138,9 @@ describe('Tests for Always on top', () => {
robot.setMouseDelay(200);
robot.moveMouse(190, 0);
robot.mouseClick();
// Key tap 10 times as "Always on Top" is in the
// 10th position under view menu item
for (let i = 0; i < 10; i++) {
// Key tap 9 times as "Always on Top" is in the
// 9th position under view menu item
for (let i = 0; i < 9; i++) {
robot.keyTap('down');
}
robot.keyTap('enter');

6
tests/spectron/full-screen.spectron.js
View File

@@ -105,9 +105,9 @@ describe('Tests for Full screen', () => {
robot.mouseClick();
robot.setKeyboardDelay(100);
// Key tap 8 times as "Enter Full Screen" is in the
// 8th position under view menu item
for (let i = 0; i < 8; i++) {
// Key tap 7 times as "Enter Full Screen" is in the
// 7th position under view menu item
for (let i = 0; i < 7; i++) {
robot.keyTap('down');
}
robot.keyTap('enter');

6
tests/spectron/minimize-on-close.spectron.js
View File

@@ -119,9 +119,9 @@ describe('Tests for Minimize on Close', () => {
robot.mouseClick();
robot.setKeyboardDelay(100);
// Key tap 9 times as "Minimize on Close" is in the
// 9th position under view menu item
for (let i = 0; i < 9; i++) {
// Key tap 10 times as "Minimize on Close" is in the
// 10th position under view menu item
for (let i = 0; i < 10; i++) {
robot.keyTap('down');
}
robot.keyTap('enter');