fix(html5 history): going forward

AoDev · Feb 18, 2019 · e5047d2 · e5047d2
1 parent 0368679
commit e5047d2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/Router.js b/src/Router.js
@@ -165,6 +165,9 @@ export default class Router {
     if (goToOptions.goingBack) {
       this.history = this.history.slice(1)
     }
+    else if (goToOptions.action === 'POP') {
+      this.history = [updatedRequest].concat(this.history.slice(1))
+    }
     else {
       this.history = [updatedRequest].concat(this.history)
     }
@@ -179,7 +182,7 @@ export default class Router {
    */
   goBack () {
     if (this.history.length > 1) {
-      this.goTo(this.history[1], {goingBack: true})
+      this.goTo(this.history[1], {action: 'POP', goingBack: true})
     }
   }
 

diff --git a/src/html5HistoryPlugin.js b/src/html5HistoryPlugin.js
@@ -76,12 +76,7 @@ export function createHistory (router, options = {}) {
   history.listen((location, action) => {
     const newRequest = requestFromLocation(location)
     if (isDifferentRequest(newRequest, router)) {
-      if (action === 'POP') {
-        router.goBack()
-      }
-      else if (action === 'PUSH') {
-        router.goTo(newRequest)
-      }
+      router.goTo(newRequest, {action})
     }
   })