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

use window.location instead of location

Browse source
This commit is contained in:
Zeke Sikelianos 2016-03-30 14:07:27 -07:00 • committed by Kevin Sawicki
parent 6425ef4261
commit 47a61e9f27
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/renderer/chrome-api.js
View file

@ -4,9 +4,9 @@ const chrome = window.chrome = window.chrome || {}
chrome.extension = { chrome.extension = {
getURL: function (path) { getURL: function (path) {
return url.format({ return url.format({
protocol: location.protocol, protocol: window.location.protocol,
slashes: true, slashes: true,
hostname: location.hostname, hostname: window.location.hostname,
pathname: path pathname: path
}) })
} }

4
lib/renderer/init.js
View file

@ -65,11 +65,11 @@ for (i = 0, len = ref.length; i < len; i++) {
} }
} }
if (location.protocol === 'chrome-devtools:') { if (window.location.protocol === 'chrome-devtools:') {
// Override some inspector APIs. // Override some inspector APIs.
require('./inspector') require('./inspector')
nodeIntegration = 'true' nodeIntegration = 'true'
} else if (location.protocol === 'chrome-extension:') { } else if (window.location.protocol === 'chrome-extension:') {
// Add implementations of chrome API. // Add implementations of chrome API.
require('./chrome-api') require('./chrome-api')
nodeIntegration = 'true' nodeIntegration = 'true'

2
lib/renderer/override.js
View file

@ -70,7 +70,7 @@ var BrowserWindowProxy = (function () {
if (targetOrigin == null) { if (targetOrigin == null) {
targetOrigin = '*' targetOrigin = '*'
} }
return ipcRenderer.send('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_POSTMESSAGE', this.guestId, message, targetOrigin, location.origin) return ipcRenderer.send('ATOM_SHELL_GUEST_WINDOW_MANAGER_WINDOW_POSTMESSAGE', this.guestId, message, targetOrigin, window.location.origin)
} }
BrowserWindowProxy.prototype['eval'] = function (...args) { BrowserWindowProxy.prototype['eval'] = function (...args) {