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

Potential fix for URL bar lag. #4563

Merged
merged 1 commit into from
Oct 6, 2016
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
9 changes: 6 additions & 3 deletions js/components/urlBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class UrlBar extends ImmutableComponent {
return windowStore.getFrame(this.props.activeFrameKey)
}

isActive () {
get isActive () {
return this.props.urlbar.get('active')
}

Expand Down Expand Up @@ -370,6 +370,9 @@ class UrlBar extends ImmutableComponent {
}

render () {
const value = !this.isActive || this.props.locationValueSuffix.length > 0
? this.locationValue + this.props.locationValueSuffix
: undefined
return <form
className='urlbarForm'
action='#'
Expand Down Expand Up @@ -412,10 +415,10 @@ class UrlBar extends ImmutableComponent {
onFocus={this.onFocus}
onBlur={this.onBlur}
onKeyDown={this.onKeyDown}
onChange={this.onChange}
onKeyUp={this.onChange}
onClick={this.onClick}
onContextMenu={this.onContextMenu}
value={this.locationValue + this.props.locationValueSuffix}
value={value}
data-l10n-id='urlbar'
className={cx({
insecure: !this.props.isSecure && this.props.loading === false && !this.isHTTPPage,
Expand Down