github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes electron/electron#12147 (#12193)

Browse Source
This commit is contained in:
nous-
2018-03-15 07:29:32 +03:00
committed by Samuel Attard
parent 9aeb61181a
commit f54c94d6c9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/browser/api/navigation-controller.js
View File

@@ -21,11 +21,6 @@ var NavigationController = (function () {
this.webContents = webContents
this.clearHistory()
// webContents may have already navigated to a page.
if (this.webContents._getURL()) {
this.currentIndex++
this.history.push(this.webContents._getURL())
}
this.webContents.on('navigation-entry-commited', (event, url, inPage, replaceEntry) => {
if (this.inPageIndex > -1 && !inPage) {
// Navigated to a new page, clear in-page mark.
@@ -106,6 +101,12 @@ var NavigationController = (function () {
this.currentIndex = -1
this.pendingIndex = -1
this.inPageIndex = -1
// webContents may have already navigated to a page.
if (this.webContents._getURL()) {
this.currentIndex++
this.history.push(this.webContents._getURL())
}
}
NavigationController.prototype.goBack = function () {