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

Fix js coding style errors

Browse source
This commit is contained in:
Ahmed Mohamed Ali 2017-10-20 08:46:41 +02:00
parent 9f3cfa2dbd
commit 1e9942c1bf
3 changed files with 50 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spec/chromium-spec.js
View file

@ -992,9 +992,6 @@ describe('chromium feature', function () {
slashes: true slashes: true
}) })
function createBrowserWindow ({plugins, preload}) { function createBrowserWindow ({plugins, preload}) {
w = new BrowserWindow({ w = new BrowserWindow({
show: false, show: false,
@ -1005,8 +1002,6 @@ describe('chromium feature', function () {
}) })
} }
function testPDFIsLoadedInSubFrame (page, preloadFile, done) { function testPDFIsLoadedInSubFrame (page, preloadFile, done) {
const pagePath = url.format({ const pagePath = url.format({
pathname: path.join(fixtures, 'pages', page).replace(/\\/g, '/'), pathname: path.join(fixtures, 'pages', page).replace(/\\/g, '/'),
@ -1029,7 +1024,6 @@ describe('chromium feature', function () {
w.webContents.loadURL(pagePath) w.webContents.loadURL(pagePath)
} }
it('opens when loading a pdf resource as top level navigation', function (done) { it('opens when loading a pdf resource as top level navigation', function (done) {
createBrowserWindow({plugins: true, preload: 'preload-pdf-loaded.js'}) createBrowserWindow({plugins: true, preload: 'preload-pdf-loaded.js'})
ipcMain.once('pdf-loaded', function (event, state) { ipcMain.once('pdf-loaded', function (event, state) {
@ -1101,8 +1095,6 @@ describe('chromium feature', function () {
it('opens when loading a pdf resource in a nested iframe', function (done) { it('opens when loading a pdf resource in a nested iframe', function (done) {
testPDFIsLoadedInSubFrame('pdf-in-nested-iframe.html', 'preload-pdf-loaded-in-nested-subframe.js', done) testPDFIsLoadedInSubFrame('pdf-in-nested-iframe.html', 'preload-pdf-loaded-in-nested-subframe.js', done)
}) })
}) })
describe('window.alert(message, title)', function () { describe('window.alert(message, title)', function () {

11
spec/fixtures/module/preload-pdf-loaded-in-nested-subframe.js vendored
View file

@ -1,16 +1,15 @@
const {ipcRenderer} = require('electron') const {ipcRenderer} = require('electron')
document.addEventListener("DOMContentLoaded", function(event) { document.addEventListener('DOMContentLoaded', function (event) {
var outerFrame = document.getElementById('outer-frame'); var outerFrame = document.getElementById('outer-frame')
if (outerFrame) { if (outerFrame) {
outerFrame.onload = function () { outerFrame.onload = function () {
var pdframe = outerFrame.contentWindow.document.getElementById('pdf-frame'); var pdframe = outerFrame.contentWindow.document.getElementById('pdf-frame')
if (pdframe) { if (pdframe) {
pdframe.contentWindow.addEventListener('pdf-loaded', function (event) { pdframe.contentWindow.addEventListener('pdf-loaded', function (event) {
ipcRenderer.send('pdf-loaded', event.detail) ipcRenderer.send('pdf-loaded', event.detail)
}); })
} }
} }
} }
}); })

9
spec/fixtures/module/preload-pdf-loaded-in-subframe.js vendored
View file

@ -1,11 +1,10 @@
const {ipcRenderer} = require('electron') const {ipcRenderer} = require('electron')
document.addEventListener("DOMContentLoaded", function(event) { document.addEventListener('DOMContentLoaded', function (event) {
var subframe = document.getElementById('pdf-frame'); var subframe = document.getElementById('pdf-frame')
if (subframe) { if (subframe) {
subframe.contentWindow.addEventListener('pdf-loaded', function (event) { subframe.contentWindow.addEventListener('pdf-loaded', function (event) {
ipcRenderer.send('pdf-loaded', event.detail) ipcRenderer.send('pdf-loaded', event.detail)
}); })
} }
}); })