Merge pull request #5178 from darkdh/5177

Handle reload by setUrl in window store
brave · Oct 27, 2016 · badd82d · badd82d
2 parents fc9902c + e25fc58
commit badd82d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/js/components/frame.js b/js/components/frame.js
@@ -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()
  }