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

Commit

Permalink
Handle reload by setUrl in window store
Browse files Browse the repository at this point in the history
fix #5177

Auditors: @bbondy

Test Plan:
1. Type brave.123 in navigation bar
2. After DNS error page is presented, click refresh button next to navigation bar
3. The error page refresh normally

1. Type brave.123 in navigation bar
2. After DNS error page is presented, click "Retry the URL" in error page
3. The error page refresh normally

1. Navigate to https://expired.badssl.com/
2. After cert error page is presented, click refresh button next to navigation bar
3. The error page refresh normally

1. Navigate to https://expired.badssl.com/
2. After cert error page is presented, click "Retry the URL" in error page
3. The error page refresh normally

1. Make network unavailable
2. Type anything in navigation bar
3. After connection error page is presented, click refresh button next to navigation bar
4. The error page refresh normally

1. Make network unavailable
2. Type anything in navigation bar
3. After connection error page is presented, click "Retry the URL" in error page
4. The error page refresh normally

1. Make network unavailable
2. Type anything in navigation bar
3. After connection error page is presented, make network available
4. Click refresh button next to navigation bar
5. The original page should load

1. Make network unavailable
2. Type anything in navigation bar
3. After connection error page is presented, make network available
4. Click "Retry the URL" in error page
5. The original page should load
  • Loading branch information
darkdh committed Oct 27, 2016
1 parent 957b748 commit e25fc58
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions js/components/frame.js
Original file line number Diff line number Diff line change
Expand Up @@ -458,8 +458,11 @@ class Frame extends ImmutableComponent {
// In this case both the user display and the user think they're on this.props.location.
if (this.webview.getURL() !== this.props.location && !this.isAboutPage()) {
this.webview.loadURL(this.props.location)
} else if (this.isIntermediateAboutPage()) {
this.webview.loadURL(this.props.aboutDetails.get('url'))
} else if (this.isIntermediateAboutPage() &&
this.webview.getURL() !== this.props.location &&
this.webview.getURL() !== this.props.aboutDetails.get('url')) {
windowActions.setUrl(this.props.aboutDetails.get('url'),
this.props.aboutDetails.get('frameKey'))
} else {
this.webview.reload()
}
Expand Down

0 comments on commit e25fc58

Please sign in to comment.