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

allow search icon to show while loading #6532

Merged
Changes from all commits
Commits
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: 1 addition & 4 deletions app/renderer/components/urlBarIcon.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,15 @@ class UrlBarIcon extends ImmutableComponent {
}
/**
* search icon:
* - does not show when loading
* - does not show when in title mode
* - shows when urlbar is active (ex: you can type)
* - is a catch-all for: about pages, files, etc
*/
get isSearch () {
const showSearch = this.props.active &&
this.props.loading === false
const showSearch = this.props.active

const defaultToSearch = (!this.isSecure && !this.isInsecure && !showSearch) &&
!this.props.titleMode &&
this.props.loading === false &&
!this.isAboutPage

return showSearch || defaultToSearch
Expand Down