diff --git a/lib/renderer/inspector.js b/lib/renderer/inspector.js index 2b0fcbc80c1d..d7ef7e1a9354 100644 --- a/lib/renderer/inspector.js +++ b/lib/renderer/inspector.js @@ -1,11 +1,10 @@ -/* globals InspectorFrontendHost, WebInspector, DevToolsAPI, DevToolsAPI, Blob */ - window.onload = function () { + // Use menu API to show context menu. - InspectorFrontendHost.showContextMenuAtPoint = createMenu + window.InspectorFrontendHost.showContextMenuAtPoint = createMenu // Use dialog API to override file chooser dialog. - return (WebInspector.createFileSelectorElement = createFileSelectorElement) + return (window.WebInspector.createFileSelectorElement = createFileSelectorElement) } var convertToMenuTemplate = function (items) { @@ -32,8 +31,8 @@ var convertToMenuTemplate = function (items) { } if (item.id != null) { transformed.click = function () { - DevToolsAPI.contextMenuItemSelected(item.id) - return DevToolsAPI.contextMenuCleared() + window.DevToolsAPI.contextMenuItemSelected(item.id) + return window.DevToolsAPI.contextMenuCleared() } } return template.push(transformed) diff --git a/lib/renderer/override.js b/lib/renderer/override.js index a0177b70f84b..4bce0c6b770f 100644 --- a/lib/renderer/override.js +++ b/lib/renderer/override.js @@ -1,5 +1,3 @@ -/* globals Event */ - 'use strict' const ipcRenderer = require('electron').ipcRenderer diff --git a/lib/renderer/web-view/guest-view-internal.js b/lib/renderer/web-view/guest-view-internal.js index 6c5a499ca9dd..f4023d22701a 100644 --- a/lib/renderer/web-view/guest-view-internal.js +++ b/lib/renderer/web-view/guest-view-internal.js @@ -1,5 +1,3 @@ -/* globals Event */ - 'use strict' const ipcRenderer = require('electron').ipcRenderer diff --git a/lib/renderer/web-view/web-view-attributes.js b/lib/renderer/web-view/web-view-attributes.js index 72395fe4a2c5..c76e0d26f953 100644 --- a/lib/renderer/web-view/web-view-attributes.js +++ b/lib/renderer/web-view/web-view-attributes.js @@ -1,5 +1,3 @@ -/* globals MutationObserver */ - 'use strict' const WebViewImpl = require('./web-view') diff --git a/lib/renderer/web-view/web-view.js b/lib/renderer/web-view/web-view.js index d5b57c65149f..0e96d0c06433 100644 --- a/lib/renderer/web-view/web-view.js +++ b/lib/renderer/web-view/web-view.js @@ -1,5 +1,3 @@ -/* globals Event, HTMLObjectElement */ - 'use strict' const deprecate = require('electron').deprecate diff --git a/package.json b/package.json index 4b4691abb3ba..c12f3d37c42c 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,10 @@ "/out", "/spec", "/vendor" - ] + ], + "env": { + "browser": true + } }, "private": true, "scripts": { diff --git a/spec/api-session-spec.js b/spec/api-session-spec.js index 563599f13682..d655788c79b3 100644 --- a/spec/api-session-spec.js +++ b/spec/api-session-spec.js @@ -1,5 +1,3 @@ -/* globals WebView */ - const assert = require('assert') const http = require('http') const path = require('path') diff --git a/spec/api-web-frame-spec.js b/spec/api-web-frame-spec.js index 83fb4a560c55..450bf1c33ec1 100644 --- a/spec/api-web-frame-spec.js +++ b/spec/api-web-frame-spec.js @@ -1,5 +1,3 @@ -/* globals fetch */ - const assert = require('assert') const path = require('path') const webFrame = require('electron').webFrame @@ -10,7 +8,7 @@ describe('webFrame module', function () { it('supports fetch api', function (done) { webFrame.registerURLSchemeAsPrivileged('file') var url = 'file://' + fixtures + '/assets/logo.png' - fetch(url).then(function (response) { + window.fetch(url).then(function (response) { assert(response.ok) done() }).catch(function (err) { diff --git a/spec/api-web-request-spec.js b/spec/api-web-request-spec.js index 8ce4bca8db11..abc4f9568cd3 100644 --- a/spec/api-web-request-spec.js +++ b/spec/api-web-request-spec.js @@ -1,5 +1,3 @@ -/* globals $ */ - const assert = require('assert') const http = require('http') const qs = require('querystring') diff --git a/spec/asar-spec.js b/spec/asar-spec.js index 508ce8b557b8..45c4c119ca96 100644 --- a/spec/asar-spec.js +++ b/spec/asar-spec.js @@ -1,5 +1,3 @@ -/* globals xit */ - const assert = require('assert') const child_process = require('child_process') const fs = require('fs') diff --git a/spec/chromium-spec.js b/spec/chromium-spec.js index 87140be7c805..b6e9a775ed07 100644 --- a/spec/chromium-spec.js +++ b/spec/chromium-spec.js @@ -1,4 +1,3 @@ -/* globals xdescribe, Worker, SharedWorker, WebSocket, HTMLElement */ const assert = require('assert') const http = require('http') diff --git a/spec/fixtures/pages/service-worker/service-worker.js b/spec/fixtures/pages/service-worker/service-worker.js index be5ecefd5701..7d80f45e2df4 100644 --- a/spec/fixtures/pages/service-worker/service-worker.js +++ b/spec/fixtures/pages/service-worker/service-worker.js @@ -1,5 +1,3 @@ -/* globals self, URL, Response */ - self.addEventListener('fetch', function (event) { var requestUrl = new URL(event.request.url) diff --git a/spec/node-spec.js b/spec/node-spec.js index 68b328b2ab9b..286c4d6f9161 100644 --- a/spec/node-spec.js +++ b/spec/node-spec.js @@ -1,5 +1,3 @@ -/* globals xit */ - const assert = require('assert') const child_process = require('child_process') const fs = require('fs') diff --git a/spec/package.json b/spec/package.json index a6ca81c5ee98..0439f4b0ec0f 100644 --- a/spec/package.json +++ b/spec/package.json @@ -21,7 +21,12 @@ }, "standard": { "env": { - "mocha": true - } + "mocha": true, + "jquery": true, + "serviceworker": true + }, + "globals": [ + "WebView" + ] } } diff --git a/spec/webview-spec.js b/spec/webview-spec.js index 4fdba97249a5..e51162935634 100644 --- a/spec/webview-spec.js +++ b/spec/webview-spec.js @@ -1,5 +1,3 @@ -/* globals btoa, WebView, xdescribe */ - const assert = require('assert') const path = require('path') const http = require('http')