New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix navigation controller #7175

Merged
merged 1 commit into from Sep 13, 2016

Conversation

Projects
None yet
2 participants
@bsuh
Contributor

bsuh commented Sep 11, 2016

In-page navigation has not actually started if the current entry is
being replaced. Do not set inPageIndex if replaceEntry is true.

Load Twitch frontpage
image

Navigate out of page to game directory
image

Go back in history to frontpage
image

Attempt to go forward in history

I believe the Twitch frontpage uses window.history.replaceState() on load and this leads NavigationController to believe that in-page navigation has started and that this.webContents._goForward() should be used instead of out-of-page navigation this.webContents._loadURL().

Fix navigation controller
In-page navigation has not actually started if the current entry is
being replaced. Do not set inPageIndex if replaceEntry is true.
@zcbenz

This comment has been minimized.

Contributor

zcbenz commented Sep 13, 2016

👍

@zcbenz zcbenz merged commit df3f0a4 into electron:master Sep 13, 2016

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment