From: Bot Blink Date: Wed, 20 Jan 2021 03:33:33 +0000 (+0000) Subject: Merge "Using native window open" into tizen X-Git-Tag: submit/tizen/20210120.160025^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=caff455d1d98d3fed46eb0777c1225fd7824446e;hp=72cfa7a3bccffd5f517665c9e0e3f52e69bd1d84;p=platform%2Fframework%2Fweb%2Fwrtjs.git Merge "Using native window open" into tizen --- diff --git a/wrt_app/browser/wrt_window.ts b/wrt_app/browser/wrt_window.ts index 2ac5a14..ebb7423 100644 --- a/wrt_app/browser/wrt_window.ts +++ b/wrt_app/browser/wrt_window.ts @@ -29,14 +29,13 @@ WRTWindow.prototype._init = function () { if (typeof this.setup === 'function') this.setup(); this.constructor = BrowserWindow; - let self = this; this.webContents.on('new-window', (event: Electron.NewWindowWebContentsEvent, url: string, frameName: string, disposition: ('default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other'), options: any) => { event.preventDefault(); - if (!options.webContents || options.webContents === self) { + if (!options.webContents) { options.webContents = WRTWebContents.create(); options.webContents.loadURL(url); } diff --git a/wrt_app/src/web_application.ts b/wrt_app/src/web_application.ts index dee5636..a48dfa2 100644 --- a/wrt_app/src/web_application.ts +++ b/wrt_app/src/web_application.ts @@ -247,7 +247,8 @@ export class WebApplication { show: false, webPreferences: { nodeIntegration: options.isAddonAvailable, - nodeIntegrationInWorker: false + nodeIntegrationInWorker: false, + nativeWindowOpen: true, }, webContents: WRTWebContents.create(), };