Create new window with option of parent window 49/209849/2
authorSangYong Park <sy302.park@samsung.com>
Thu, 11 Jul 2019 22:00:22 +0000 (07:00 +0900)
committerSangYong Park <sy302.park@samsung.com>
Fri, 12 Jul 2019 01:50:00 +0000 (10:50 +0900)
Currently new window is created with electron's default option.
Some javascript contents has conflict with node.js. so, apply
parent window's option when new window is created.
(webtct tct-ui01-wrt-tests failed because of this issue.)

Change-Id: I148879d4b74e00abb037176a315de5774193e076
Signed-off-by: SangYong Park <sy302.park@samsung.com>
wrt_app/browser/wrt_window.js

index e3a5977..573ad4f 100644 (file)
@@ -27,10 +27,11 @@ WRTWindow.prototype._init = function () {
   let self = this
   this.webContents.on('new-window', (event, url, frameName, disposition, options) => {
     event.preventDefault()
-    let parentOptions = self.browserWindowOptions || {}
-    parentOptions.webContents = options.webContents || WRTWebContents()
-    const win = new WRTWindow(parentOptions)
-    event.newGuest = win
+    if (!options.webContents || options.webContents === self) {
+      options.webContents = WRTWebContents()
+      options.webContents.loadURL(url)
+    }
+    event.newGuest = new WRTWindow(options)
   })
 }