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

Implement asynchronous versions of getZoomFactor and GetZoomLevel on the webContents object

Browse source
This commit is contained in:
Samuel Attard 2016-08-02 13:02:55 +10:00
parent a1f5ca1ad2
commit e4f6083753
2 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/browser/api/web-contents.js
View file

@ -89,6 +89,11 @@ const webFrameMethods = [
'setZoomLevelLimits' 'setZoomLevelLimits'
] ]
const webFrameMethodsWithResult = [
'getZoomFactor',
'getZoomLevel'
]
// Add JavaScript wrappers for WebContents class. // Add JavaScript wrappers for WebContents class.
const wrapWebContents = function (webContents) { const wrapWebContents = function (webContents) {
// webContents is an EventEmitter. // webContents is an EventEmitter.
@ -120,6 +125,21 @@ const wrapWebContents = function (webContents) {
} }
} }
const asyncWebFrameMethods = function (requestId, method, callback, ...args) {
this.send('ELECTRON_INTERNAL_RENDERER_ASYNC_WEB_FRAME_METHOD', requestId, method, args)
ipcMain.once(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, function (event, result) {
console.info(callback);
if (callback) callback(result)
})
}
const syncWebFrameMethods = function (requestId, method, callback, ...args) {
this.send('ELECTRON_INTERNAL_RENDERER_SYNC_WEB_FRAME_METHOD', requestId, method, args)
ipcMain.once(`ELECTRON_INTERNAL_BROWSER_SYNC_WEB_FRAME_RESPONSE_${requestId}`, function (event, result) {
if (callback) callback(result)
})
}
// Mapping webFrame methods. // Mapping webFrame methods.
for (const method of webFrameMethods) { for (const method of webFrameMethods) {
webContents[method] = function (...args) { webContents[method] = function (...args) {
@ -127,11 +147,12 @@ const wrapWebContents = function (webContents) {
} }
} }
const asyncWebFrameMethods = function (requestId, method, callback, ...args) { for (const method of webFrameMethodsWithResult) {
this.send('ELECTRON_INTERNAL_RENDERER_ASYNC_WEB_FRAME_METHOD', requestId, method, args) webContents[method] = function (...args) {
ipcMain.once(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, function (event, result) { const callback = args[args.length - 1]
if (callback) callback(result) const actualArgs = args.slice(0, args.length - 2)
}) syncWebFrameMethods.call(this, getNextId(), method, callback, ...actualArgs)
}
} }
// Make sure webContents.executeJavaScript would run the code only when the // Make sure webContents.executeJavaScript would run the code only when the

5
lib/renderer/init.js
View file

@ -32,6 +32,11 @@ electron.ipcRenderer.on('ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', (event, m
electron.webFrame[method].apply(electron.webFrame, args) electron.webFrame[method].apply(electron.webFrame, args)
}) })
electron.ipcRenderer.on('ELECTRON_INTERNAL_RENDERER_SYNC_WEB_FRAME_METHOD', (event, requestId, method, args) => {
const result = electron.webFrame[method].apply(electron.webFrame, args)
event.sender.send(`ELECTRON_INTERNAL_BROWSER_SYNC_WEB_FRAME_RESPONSE_${requestId}`, result)
})
electron.ipcRenderer.on('ELECTRON_INTERNAL_RENDERER_ASYNC_WEB_FRAME_METHOD', (event, requestId, method, args) => { electron.ipcRenderer.on('ELECTRON_INTERNAL_RENDERER_ASYNC_WEB_FRAME_METHOD', (event, requestId, method, args) => {
const responseCallback = function (result) { const responseCallback = function (result) {
event.sender.send(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, result) event.sender.send(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, result)