Merge pull request #2718 from david-gang/find-branch

#323 - differentiate between external and internal navigation when hiding findbar
brave · Jul 26, 2016 · 26061bf · 26061bf
2 parents 823dbf0 + e4e9613
commit 26061bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/js/components/findbar.js b/js/components/findbar.js
@@ -69,9 +69,6 @@ class FindBar extends ImmutableComponent {
       // Redo search if details have changed
       this.onFindFirst()
     }
-    if (this.props.frame.get('location') !== prevProps.frame.get('location')) {
-      this.props.onFindHide()
-    }
   }
 
   onKeyDown (e) {

diff --git a/js/components/frame.js b/js/components/frame.js
@@ -678,7 +678,11 @@ class Frame extends ImmutableComponent {
       // XXX: loadstart probably does not need to be called twice anymore.
       loadStart(e)
     })
+
     this.webview.addEventListener('did-navigate', (e) => {
+      if (this.props.frame.get('findbarShown')) {
+        this.onFindHide()
+      }
       for (let message in this.notificationCallbacks) {
         appActions.hideMessageBox(message)
       }