From 31bef5ed0228a1b1fc111d9a396d38b95067a1c9 Mon Sep 17 00:00:00 2001 From: rhysd Date: Sat, 21 Nov 2015 07:15:38 +0900 Subject: [PATCH] DevTools-related methods are moved from BrowserWindow to WebContents DevTools-related methods are no longer defined in `BrowserWindow`. https://github.com/atom/electron/blob/master/docs/api/browser-window.md Instead, they are defined in `WebContents`. https://github.com/atom/electron/blob/master/docs/api/web-contents.md --- github-electron/github-electron-main-tests.ts | 10 +++-- github-electron/github-electron.d.ts | 42 +++++++++---------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/github-electron/github-electron-main-tests.ts b/github-electron/github-electron-main-tests.ts index 3bce8390e..8a4dcced8 100644 --- a/github-electron/github-electron-main-tests.ts +++ b/github-electron/github-electron-main-tests.ts @@ -61,9 +61,11 @@ app.on('ready', () => { mainWindow.loadUrl('file://foo/bar', {userAgent: 'cool-agent', httpReferrer: 'greateRefferer'}); mainWindow.webContents.loadUrl('file://foo/bar', {userAgent: 'cool-agent', httpReferrer: 'greateRefferer'}); - mainWindow.openDevTools() - var opened: boolean = mainWindow.isDevToolsOpened() - mainWindow.toggleDevTools() + mainWindow.webContents.openDevTools(); + mainWindow.webContents.toggleDevTools(); + mainWindow.webContents.openDevTools({detach: true}); + mainWindow.webContents.closeDevTools(); + var opened: boolean = mainWindow.webContents.isDevToolsOpened() // Emitted when the window is closed. mainWindow.on('closed', () => { // Dereference the window object, usually you would store windows @@ -344,7 +346,7 @@ var template = [ { label: 'Toggle DevTools', accelerator: 'Alt+Command+I', - click: () => { BrowserWindow.getFocusedWindow().toggleDevTools(); } + click: () => { BrowserWindow.getFocusedWindow().webContents.toggleDevTools(); } } ] }, diff --git a/github-electron/github-electron.d.ts b/github-electron/github-electron.d.ts index fee13c29f..cc9099489 100644 --- a/github-electron/github-electron.d.ts +++ b/github-electron/github-electron.d.ts @@ -343,27 +343,6 @@ declare module GitHubElectron { * @returns Whether the window's document has been edited. */ isDocumentEdited(): boolean; - /** - * Opens the developer tools. - */ - openDevTools(options?: { - /** - * Opens devtools in a new window. - */ - detach?: boolean; - }): void; - /** - * Closes the developer tools. - */ - closeDevTools(): void; - /** - * Returns whether the developer tools are opened. - */ - isDevToolsOpened(): boolean; - /** - * Toggle the developer tools. - */ - toggleDevTools(): void; reloadIgnoringCache(): void; /** * Starts inspecting element at position (x, y). @@ -731,6 +710,27 @@ declare module GitHubElectron { * data Buffer - PDF file content */ callback: (error: Error, data: Buffer) => void): void; + /** + * Opens the developer tools. + */ + openDevTools(options?: { + /** + * Opens devtools in a new window. + */ + detach?: boolean; + }): void; + /** + * Closes the developer tools. + */ + closeDevTools(): void; + /** + * Returns whether the developer tools are opened. + */ + isDevToolsOpened(): boolean; + /** + * Toggle the developer tools. + */ + toggleDevTools(): void; /** * Send args.. to the web page via channel in asynchronous message, the web page * can handle it by listening to the channel event of ipc module.