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

refactor: implement clipboard APIs without the remote module (#17200)

Browse source
This commit is contained in:
Milan Burda 2019-03-16 01:32:04 +01:00 • committed by Shelley Vohr
parent 43ef561d48
commit 3a091cdea4
10 changed files with 118 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/renderer/web-view/web-view-impl.ts
View file

@ -1,4 +1,4 @@
import { deprecate, webFrame } from 'electron'
import { deprecate, remote, webFrame } from 'electron'
import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils'
import * as guestViewInternal from '@electron/internal/renderer/web-view/guest-view-internal'
@ -221,15 +221,15 @@ export const setupAttributes = () => {
export const setupMethods = (WebViewElement: typeof ElectronInternal.WebViewElement) => {
// WebContents associated with this webview.
WebViewElement.prototype.getWebContents = function () {
const { getRemote } = require('@electron/internal/renderer/remote')
const getGuestWebContents = getRemote('getGuestWebContents')
if (!remote) {
throw new Error('getGuestWebContents requires remote, which is not enabled')
}
const internal = v8Util.getHiddenValue<WebViewImpl>(this, 'internal')
if (!internal.guestInstanceId) {
internal.createGuestSync()
}
return getGuestWebContents(internal.guestInstanceId)
return (remote as Electron.RemoteInternal).getGuestWebContents(internal.guestInstanceId!)
}
// Focusing the webview should move page focus to the underlying iframe.