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

Fix default engine display problem for fresh profile #3275

Merged
merged 2 commits into from
Aug 20, 2016
Merged

Fix default engine display problem for fresh profile #3275

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f82a848
Fix default engine display problem for fresh profile
darkdh Aug 20, 2016
1477399
Remove shouldComponentUpdate for Immutable SearchSelectEntry
darkdh Aug 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions js/about/preferences.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,11 +365,12 @@ class GeneralTab extends ImmutableComponent {

class SearchSelectEntry extends ImmutableComponent {
shouldComponentUpdate (nextProps, nextState) {
return this.props.settings.get(settings.DEFAULT_SEARCH_ENGINE) !== nextProps.settings.get(settings.DEFAULT_SEARCH_ENGINE)
return getSetting(settings.DEFAULT_SEARCH_ENGINE, this.props.settings) !==
getSetting(settings.DEFAULT_SEARCH_ENGINE, nextProps.settings)
Copy link
Member

Choose a reason for hiding this comment

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

I commented on the commit on your branch by mistake instead of here:
darkdh@f82a848

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for the feedback. Fixed in 1477399

}
render () {
return <div>
{this.props.settings.get(settings.DEFAULT_SEARCH_ENGINE) === this.props.name
{getSetting(settings.DEFAULT_SEARCH_ENGINE, this.props.settings) === this.props.name
? <span className='fa fa-check-square' id='searchSelectIcon' /> : null}
</div>
}
Expand Down