Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Fix immutable.getIn and autofillPopupHidden condition #6234

Merged
merged 1 commit into from
Dec 15, 2016

Conversation

darkdh
Copy link
Member

@darkdh darkdh commented Dec 15, 2016

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).

Test Plan: Covered by auto test

fix #6233

Auditors: @bridiver, @bbondy

if (windowState.getIn('contextMenuDetail', 'type') === 'autofill' &&
windowState.getIn('contextMenuDetail', 'tabId') === action.tabId) {
if (windowState.getIn(['contextMenuDetail', 'type']) === 'autofill' &&
windowState.getIn(['contextMenuDetail', 'tabId']) === action.tabId) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

woops, it'd be nice to lint for this type of error eventually.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is probably the reason the code above was still needed. I think we can keep this and lose the isFocused check

@bbondy
Copy link
Member

bbondy commented Dec 15, 2016

++

@bbondy bbondy merged commit 0d17aec into brave:chromium54 Dec 15, 2016
@@ -688,7 +688,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()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this shouldn't be necessary anymore. I changed windowStore to make a check instead. I think we may want to revert this unless I'm missing something

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants