]> git.ipfire.org Git - thirdparty/vuejs/router.git/commitdiff
refactor(router): use paused property in router listener
authorEduardo San Martin Morote <posva13@gmail.com>
Wed, 5 Jun 2019 14:28:49 +0000 (16:28 +0200)
committerEduardo San Martin Morote <posva13@gmail.com>
Wed, 5 Jun 2019 14:28:49 +0000 (16:28 +0200)
src/history/html5.ts
src/router.ts

index 68de65a12ee9c1c2714ec61bc064ccb14e5a0153..34bdffe01fe58780973ebbdccb4894eeb1d74ea7 100644 (file)
@@ -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) {
index aad33aa17251424106a0a330606a6eb914052f38..f5450439acafef351805576ce34be96139c4dfab 100644 (file)
@@ -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)
           }
         }
       }