mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Apply further ES6 bikeshedding

Browse source
This commit is contained in:
Charles Kerr 2018-03-13 17:09:47 +09:00
parent 2d90e763ad
commit e400585a0e
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/browser/guest-window-manager.js
View file

@ -52,10 +52,7 @@ const mergeBrowserWindowOptions = function (embedder, options) {
// if parent's visibility is available, that overrides 'show' flag (#12125) // if parent's visibility is available, that overrides 'show' flag (#12125)
const win = BrowserWindow.fromWebContents(embedder.webContents) const win = BrowserWindow.fromWebContents(embedder.webContents)
if (win != null) { if (win != null) {
const show = win.isVisible() parentOptions = {...embedder.browserWindowOptions, show: win.isVisible()}
if (typeof show === 'boolean') {
parentOptions = {...embedder.browserWindowOptions, show}
}
} }
// Inherit the original options if it is a BrowserWindow. // Inherit the original options if it is a BrowserWindow.

4
spec/chromium-spec.js
View file

@ -223,9 +223,9 @@ describe('chromium feature', () => {
b = window.open(`file://${fixtures}/pages/window-open-size.html`, '', 'show=no') b = window.open(`file://${fixtures}/pages/window-open-size.html`, '', 'show=no')
}) })
for (const show in [true, false]) { for (const show of [true, false]) {
it(`inherits parent visibility over parent {show=${show}} option`, (done) => { it(`inherits parent visibility over parent {show=${show}} option`, (done) => {
let w = new BrowserWindow({show: show}) const w = new BrowserWindow({show})
// toggle visibility // toggle visibility
if (show) { if (show) {