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

Merge pull request #8340 from electron/options-cycle

Browse source 
Handle cycles when merging browser window options
This commit is contained in:
Kevin Sawicki 2017-01-09 08:29:56 -08:00 committed by GitHub
commit 52390120ae
4 changed files with 64 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,19 +7,25 @@ const hasProp = {}.hasOwnProperty
const frameToGuest = {} const frameToGuest = {}
// Copy attribute of |parent| to |child| if it is not defined in |child|. // Copy attribute of |parent| to |child| if it is not defined in |child|.
const mergeOptions = function (child, parent) { const mergeOptions = function (child, parent, visited) {
let key, value // Check for circular reference.
for (key in parent) { if (visited == null) visited = new Set()
if (visited.has(parent)) return
visited.add(parent)
for (const key in parent) {
if (!hasProp.call(parent, key)) continue if (!hasProp.call(parent, key)) continue
value = parent[key] if (key in child) continue
if (!(key in child)) {
const value = parent[key]
if (typeof value === 'object') { if (typeof value === 'object') {
child[key] = mergeOptions({}, value) child[key] = mergeOptions({}, value, visited)
} else { } else {
child[key] = value child[key] = value
} }
} }
} visited.delete(parent)
return child return child
} }

36
spec/chromium-spec.js
View file

@ -3,7 +3,7 @@ const http = require('http')
const path = require('path') const path = require('path')
const ws = require('ws') const ws = require('ws')
const url = require('url') const url = require('url')
const remote = require('electron').remote const {ipcRenderer, remote} = require('electron')
const {closeWindow} = require('./window-helpers') const {closeWindow} = require('./window-helpers')
const {BrowserWindow, ipcMain, protocol, session, webContents} = remote const {BrowserWindow, ipcMain, protocol, session, webContents} = remote
@ -46,7 +46,7 @@ describe('chromium feature', function () {
var w = null var w = null
afterEach(function () { afterEach(function () {
w != null ? w.destroy() : void 0 return closeWindow(w).then(function () { w = null })
}) })
it('is set correctly when window is not shown', function (done) { it('is set correctly when window is not shown', function (done) {
@ -157,7 +157,7 @@ describe('chromium feature', function () {
var w = null var w = null
afterEach(function () { afterEach(function () {
w != null ? w.destroy() : void 0 return closeWindow(w).then(function () { w = null })
}) })
it('should register for file scheme', function (done) { it('should register for file scheme', function (done) {
@ -187,6 +187,12 @@ describe('chromium feature', function () {
return return
} }
let w = null
afterEach(() => {
return closeWindow(w).then(function () { w = null })
})
it('returns a BrowserWindowProxy object', function () { it('returns a BrowserWindowProxy object', function () {
var b = window.open('about:blank', '', 'show=no') var b = window.open('about:blank', '', 'show=no')
assert.equal(b.closed, false) assert.equal(b.closed, false)
@ -260,6 +266,28 @@ describe('chromium feature', function () {
b = window.open('file://' + fixtures + '/pages/window-open-size.html', '', 'show=no,width=' + size.width + ',height=' + size.height) b = window.open('file://' + fixtures + '/pages/window-open-size.html', '', 'show=no,width=' + size.width + ',height=' + size.height)
}) })
it('handles cycles when merging the parent options into the child options', (done) => {
w = BrowserWindow.fromId(ipcRenderer.sendSync('create-window-with-options-cycle'))
w.loadURL('file://' + fixtures + '/pages/window-open.html')
w.webContents.once('new-window', (event, url, frameName, disposition, options) => {
assert.equal(options.show, false)
assert.deepEqual(options.foo, {
bar: null,
baz: {
hello: {
world: true
}
},
baz2: {
hello: {
world: true
}
}
})
done()
})
})
it('defines a window.location getter', function (done) { it('defines a window.location getter', function (done) {
var b, targetURL var b, targetURL
if (process.platform === 'win32') { if (process.platform === 'win32') {
@ -312,7 +340,7 @@ describe('chromium feature', function () {
let w = null let w = null
afterEach(function () { afterEach(function () {
if (w) w.destroy() return closeWindow(w).then(function () { w = null })
}) })
it('is null for main window', function (done) { it('is null for main window', function (done) {

2
spec/fixtures/pages/window-open.html vendored
View file

@ -1,7 +1,7 @@
<html> <html>
<body> <body>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
window.open('http://host', 'host' , 'this-is-not-a-standard-feature'); window.open('http://host', 'host', 'this-is-not-a-standard-feature');
</script> </script>
</body> </body>
</html> </html>

15
spec/static/main.js
View file

@ -230,3 +230,18 @@ ipcMain.on('close-on-will-navigate', (event, id) => {
contents.send('closed-on-will-navigate') contents.send('closed-on-will-navigate')
}) })
}) })
ipcMain.on('create-window-with-options-cycle', (event) => {
// This can't be done over remote since cycles are already
// nulled out at the IPC layer
const foo = {}
foo.bar = foo
foo.baz = {
hello: {
world: true
}
}
foo.baz2 = foo.baz
const window = new BrowserWindow({show: false, foo: foo})
event.returnValue = window.id
})