mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Revert "Fixes electron/electron#12147" (#12293)

Browse source 
* Revert "Set appropriate defaults for webview options (#12271)"

This reverts commit c2673aa970.

* Revert "Fixes electron/electron#12147 (#12193)"

This reverts commit f54c94d6c9.
This commit is contained in:
Samuel Attard 2018-03-15 16:18:37 +09:00 • committed by Shelley Vohr
parent 2681e769a6
commit 4b476f13bb
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,6 +21,11 @@ var NavigationController = (function () {
this.webContents = webContents this.webContents = webContents
this.clearHistory() 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) => { this.webContents.on('navigation-entry-commited', (event, url, inPage, replaceEntry) => {
if (this.inPageIndex > -1 && !inPage) { if (this.inPageIndex > -1 && !inPage) {
// Navigated to a new page, clear in-page mark. // Navigated to a new page, clear in-page mark.
@ -101,12 +106,6 @@ var NavigationController = (function () {
this.currentIndex = -1 this.currentIndex = -1
this.pendingIndex = -1 this.pendingIndex = -1
this.inPageIndex = -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 () { NavigationController.prototype.goBack = function () {