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

Check for no frame info in tab content components #9687

Merged
merged 1 commit into from
Jun 23, 2017
Merged

Check for no frame info in tab content components #9687

merged 1 commit into from
Jun 23, 2017

Conversation

bbondy
Copy link
Member

@bbondy bbondy commented Jun 23, 2017 •
edited by bsclifton
Loading

NOTE FOR MERGE: This is a PR against 0.17.x because unit tests are currently failing too much on other branches. So when merging merge it to 0.18.x, and master.

Auditors: @NejcZdovc

Fix #9686

Submitter Checklist:

  • 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).
  • Tagged reviewers and labelled the pull request as needed.

Test Plan:

Reviewer Checklist:

Tests

  • Adequate test coverage exists to prevent regressions
  • Tests should be independent and work correctly when run individually or as a suite ref
  • New files have MPL2 license header

@bbondy bbondy added this to the 0.17.x (Beta Channel) milestone Jun 23, 2017
@bbondy bbondy self-assigned this Jun 23, 2017
@bsclifton bsclifton requested a review from NejcZdovc June 23, 2017 21:32
NejcZdovc
NejcZdovc approved these changes Jun 23, 2017
View reviewed changes
Copy link
Contributor

@NejcZdovc NejcZdovc left a comment

Choose a reason for hiding this comment

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

LGTM ++

app/renderer/components/tabs/content/audioTabIcon.js
const frame = frameStateUtil.getFrameByKey(currentWindow, ownProps.frameKey)

// AudioIcon will never be created if there is no frameKey, but for consistency
// across other components I added teh || Immutable.Map()
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: teh -> the

@bsclifton bsclifton merged commit 72d1a01 into 0.17.x Jun 23, 2017
@bsclifton bsclifton deleted the 9686 branch June 23, 2017 22:27
bsclifton added a commit that referenced this pull request Jun 23, 2017
@bsclifton
Merge pull request #9687 from brave/9686
439b71e 
Check for no frame info in tab content components
This was referenced Jun 24, 2017
Closed
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@NejcZdovc NejcZdovc NejcZdovc approved these changes

Assignees

@bbondy bbondy

Labels
None yet
Projects
None yet
Milestone
0.17.13 (Release Channel)
Development

Successfully merging this pull request may close these issues.
3 participants
@bbondy @NejcZdovc @bsclifton