mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
Revert "fix: better window hierarchy checks"
This reverts commit bdd19d9b28.
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
'use strict'
|
||||
|
||||
const electron = require('electron')
|
||||
const nodeUrl = require('url')
|
||||
const { BrowserWindow } = electron
|
||||
const { isSameOrigin } = process.electronBinding('v8_util')
|
||||
const { ipcMainInternal } = require('@electron/internal/browser/ipc-main-internal')
|
||||
@@ -178,8 +177,9 @@ const isNodeIntegrationEnabled = function (sender) {
|
||||
|
||||
// Checks whether |sender| can access the |target|:
|
||||
const canAccessWindow = function (sender, target) {
|
||||
return isScriptableWindow(sender, target) ||
|
||||
(isChildWindow(sender, target) && isNodeIntegrationEnabled(sender))
|
||||
return isChildWindow(sender, target) ||
|
||||
isScriptableWindow(sender, target) ||
|
||||
isNodeIntegrationEnabled(sender)
|
||||
}
|
||||
|
||||
// Routed window.open messages with raw options
|
||||
@@ -187,12 +187,6 @@ ipcMainInternal.on('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_OPEN', (event, url, fra
|
||||
if (url == null || url === '') url = 'about:blank'
|
||||
if (frameName == null) frameName = ''
|
||||
if (features == null) features = ''
|
||||
const parsedSourceURL = nodeUrl.parse(event.sender.getURL())
|
||||
const parsedTargetURL = nodeUrl.parse(url)
|
||||
if (parsedTargetURL.protocol === 'file:' && parsedSourceURL.protocol !== 'file:') {
|
||||
event.returnValue = null
|
||||
return
|
||||
}
|
||||
|
||||
const options = {}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user