hide-autofill-popup only when webcontent is focused

also fix frontend id typo leads to crash fix brave#5939 Auditor: @bridiver
darkdh · Dec 1, 2016 · adf96f3 · adf96f3
1 parent 46cea13
commit adf96f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/js/components/frame.js b/js/components/frame.js
@@ -722,7 +722,10 @@ class Frame extends ImmutableComponent {
       contextMenus.onShowAutofillMenu(e.suggestions, e.rect, this.frame)
     })
     this.webview.addEventListener('hide-autofill-popup', (e) => {
-      windowActions.autofillPopupHidden(this.props.tabId)
+      let webContents = this.webview.getWebContents()
+      if (webContents && webContents.isFocused()) {
+        windowActions.autofillPopupHidden(this.props.tabId)
+      }
     })
     this.webview.addEventListener('ipc-message', (e) => {
       let method = () => {}

diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
@@ -636,7 +636,7 @@ const doAction = (action) => {
       windowStore.emitChanges()
       return
     case WindowConstants.WINDOW_AUTOFILL_SELECTION_CLICKED:
-      ipc.send('autofill-selection-clicked', action.tabId, action.value, action.frontendId, action.index)
+      ipc.send('autofill-selection-clicked', action.tabId, action.value, action.frontEndId, action.index)
       windowState = windowState.delete('contextMenuDetail')
       break
     case WindowConstants.WINDOW_AUTOFILL_POPUP_HIDDEN: