diff --git a/github-electron/github-electron-main-tests.ts b/github-electron/github-electron-main-tests.ts index b2343da39..08fb95b79 100644 --- a/github-electron/github-electron-main-tests.ts +++ b/github-electron/github-electron-main-tests.ts @@ -16,12 +16,11 @@ import { crashReporter, nativeImage, screen, - shell + shell, + hideInternalModules } from 'electron'; -require('electron').hideInternalModules(); - -import path = require('path'); +import * as path from 'path'; // Quick start // https://github.com/atom/electron/blob/master/docs/tutorial/quick-start.md @@ -106,6 +105,10 @@ app.on('ready', () => { mainWindow.printToPDF({}, (err, data) => {}); mainWindow.webContents.printToPDF({}, (err, data) => {}); + + mainWindow.webContents.executeJavaScript('return true;'); + mainWindow.webContents.executeJavaScript('return true;', true); + mainWindow.webContents.executeJavaScript('return true;', true, (result: boolean) => console.log(result)); }); // Locale diff --git a/github-electron/github-electron-renderer-tests.ts b/github-electron/github-electron-renderer-tests.ts index 7ddd585a7..31bd5a32e 100644 --- a/github-electron/github-electron-renderer-tests.ts +++ b/github-electron/github-electron-renderer-tests.ts @@ -10,7 +10,7 @@ import { shell } from 'electron'; -import fs = require('fs'); +import * as fs from 'fs'; // In renderer process (web page). // https://github.com/atom/electron/blob/master/docs/api/ipc-renderer.md diff --git a/github-electron/github-electron.d.ts b/github-electron/github-electron.d.ts index f7bab797f..3bb70fc33 100644 --- a/github-electron/github-electron.d.ts +++ b/github-electron/github-electron.d.ts @@ -636,7 +636,7 @@ declare module Electron { * Evaluates code in page. * @param code Code to evaluate. */ - executeJavaScript(code: string): void; + executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): void; /** * Executes Edit -> Undo command in page. */ @@ -1597,7 +1597,7 @@ declare module Electron { * invoked by a gesture from the user. Setting `userGesture` to `true` will remove * this limitation. */ - executeJavaScript(code: string, userGesture?: boolean): void; + executeJavaScript(code: string, userGesture?: boolean, callback?: (result: any) => void): void; } // Type definitions for main process