From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Wed, 5 Jun 2019 14:28:49 +0000 (+0200)
Subject: refactor(router): use paused property in router listener
X-Git-Tag: v4.0.0-alpha.0~351
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c0ea0005ff5f9f89fb932fbcb16c0053a4454c0;p=thirdparty%2Fvuejs%2Frouter.git

refactor(router): use paused property in router listener
---

diff --git a/src/history/html5.ts b/src/history/html5.ts
index 68de65a1..34bdffe0 100644
--- a/src/history/html5.ts
+++ b/src/history/html5.ts
@@ -92,13 +92,17 @@ export class HTML5History extends BaseHistory {
   }
 
   back(triggerListeners: boolean = true) {
-    // TODO: do not trigger listen
+    const paused = this.paused
+    if (!triggerListeners) this.paused = true
     this.history.back()
+    this.paused = paused
   }
 
   forward(triggerListeners: boolean = true) {
-    // TODO: do not trigger listen
+    const paused = this.paused
+    if (!triggerListeners) this.paused = true
     this.history.forward()
+    this.paused = paused
   }
 
   listen(callback: NavigationCallback) {
diff --git a/src/router.ts b/src/router.ts
index aad33aa1..f5450439 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -67,9 +67,7 @@ export class Router {
             // TODO: go back because we cancelled, then
             // or replace and not discard the rest of history. Check issues, there was one talking about this
             // behaviour, maybe we can do better
-            this.history.paused = true
-            this.history.back()
-            this.history.paused = false
+            this.history.back(false)
           }
         }
       }