URLbar should not remain focused when no back history

Fix #5563 Auditors: @diracdeltas
brave · Nov 12, 2016 · 7f1d0a2 · 7f1d0a2
1 parent 019a910
commit 7f1d0a2
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/js/components/frame.js b/js/components/frame.js
@@ -1032,8 +1032,11 @@ class Frame extends ImmutableComponent {
         appActions.hideMessageBox(message)
       }
       this.notificationCallbacks = {}
-      // only give focus focus is this is not the initial default page load
-      if (this.props.isActive && this.webview.canGoBack() && document.activeElement !== this.webview) {
+      const isNewTabPage = e.url === getTargetAboutUrl('about:newtab')
+      if (isNewTabPage) {
+        windowActions.setUrlBarActive(true)
+        windowActions.setUrlBarFocused(true)
+      } else if (this.props.isActive && !isNewTabPage && document.activeElement !== this.webview) {
         this.webview.focus()
       }
       windowActions.setNavigated(e.url, this.props.frameKey, false, this.frame.get('tabId'))

diff --git a/test/components/navigationBarTest.js b/test/components/navigationBarTest.js
@@ -57,6 +57,34 @@ describe('navigationBar', function () {
   }
 
   describe('navigation', function () {
+    describe('focus', function () {
+      Brave.beforeAll(this)
+      before(function * () {
+        const page1 = Brave.server.url('page1.html')
+        yield this.app.client.waitForExist(urlInput)
+        yield this.app.client
+          .windowByUrl(Brave.browserWindowUrl)
+          .tabByIndex(0)
+          .url(page1)
+          .waitForUrl(page1)
+          .windowByUrl(Brave.browserWindowUrl)
+          .ipcSend('shortcut-focus-url')
+          .waitForElementFocus(urlInput)
+          .keys(Brave.keys.ENTER)
+      })
+
+      it('webview has focus after initial load', function * () {
+        yield this.app.client.waitForElementFocus(activeWebview)
+      })
+
+      it('webview has focus after second load', function * () {
+        yield this.app.client
+          .ipcSend('shortcut-focus-url')
+          .waitForElementFocus(urlInput)
+          .keys(Brave.keys.ENTER)
+          .waitForElementFocus(activeWebview)
+      })
+    })
     describe('tabnapping', function () {
       Brave.beforeAll(this)