Focus webview for foregroud new frames

Fix #1243 Auditors: @diracdeltas
brave · Apr 5, 2016 · 0827c91 · 0827c91 · diracdeltas · Apr 6, 2016
1 parent 4d53672
commit 0827c91
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/js/components/frame.js b/js/components/frame.js
@@ -204,6 +204,10 @@ class Frame extends ImmutableComponent {
                             activeShortcutDetails.get('action'),
                             true)
         }
+        break
+      case 'focus-webview':
+        setImmediate(() => this.webview.focus())
+        break
     }
     if (activeShortcut) {
       windowActions.setActiveFrameShortcut(this.props.frame, null, null)

diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
@@ -223,7 +223,16 @@ const doAction = (action) => {
       windowState = windowState.merge(FrameStateUtil.addFrame(windowState.get('frames'), action.frameOpts,
         nextKey, nextPartitionNumber, action.openInForeground ? nextKey : windowState.get('activeFrameKey')))
       if (action.openInForeground) {
-        updateTabPageIndex(FrameStateUtil.getActiveFrame(windowState))
+        const activeFrame = FrameStateUtil.getActiveFrame(windowState)
+        updateTabPageIndex(activeFrame)
+        // For about:newtab we want to have the urlbar focused, not the new frame.
+        // Otherwise we want to focus the new tab when it is a new frame in the foreground.
+        if (activeFrame.get('location') !== 'about:newtab') {
+          windowState = windowState.mergeIn(activeFrameStatePath(), {
+            activeShortcut: 'focus-webview',
+            activeShortcutDetails: null
+          })
+        }
       }
       break
     case WindowConstants.WINDOW_CLOSE_FRAME: