Follow up of a8d33f4

Auditors: @bridiver
brave · Jan 25, 2017 · c44b0eb · c44b0eb · bridiver · Jan 25, 2017
1 parent 903df7e
commit c44b0eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/app/browser/tabs.js b/app/browser/tabs.js
@@ -72,9 +72,8 @@ const api = {
       }
 
       if (disposition === 'new-window' || disposition === 'new-popup') {
-        const windowOpts = size
-        windowOpts.disposition = disposition
-        appActions.newWindow(makeImmutable(frameOpts), makeImmutable(windowOpts))
+        const windowOpts = makeImmutable(size)
+        appActions.newWindow(makeImmutable(frameOpts), windowOpts)
       } else {
         let hostWebContents = source.hostWebContents || source
         hostWebContents.send(messages.SHORTCUT_NEW_FRAME, location, { frameOpts })

diff --git a/js/stores/appStore.js b/js/stores/appStore.js
@@ -386,7 +386,7 @@ const handleAppAction = (action) => {
       shuttingDown = true
       break
     case appConstants.APP_NEW_WINDOW:
-      const frameOpts = action.frameOpts && action.frameOpts.toJS()
+      const frameOpts = (action.frameOpts && action.frameOpts.toJS()) || {}
       const browserOpts = (action.browserOpts && action.browserOpts.toJS()) || {}
       const newWindowState = action.restoredState || {}
 
@@ -411,7 +411,7 @@ const handleAppAction = (action) => {
 
       mainWindow.webContents.on('did-finish-load', (e) => {
         lastEmittedState = appState
-        e.sender.send(messages.INITIALIZE_WINDOW, browserOpts.disposition, appState.toJS(), frames, action.restoredState)
+        e.sender.send(messages.INITIALIZE_WINDOW, frameOpts.disposition, appState.toJS(), frames, action.restoredState)
         if (action.cb) {
           action.cb()
         }