From 01a3450c0851e0b20ce958853e893de0946af237 Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Mon, 20 May 2019 15:35:59 -0700
Subject: [PATCH] Don't cancel watchers when transitioning to a sub-route

---
 ui/app/mixins/with-watchers.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/app/mixins/with-watchers.js b/ui/app/mixins/with-watchers.js
index d96992b74..af964dfca 100644
--- a/ui/app/mixins/with-watchers.js
+++ b/ui/app/mixins/with-watchers.js
@@ -31,8 +31,11 @@ export default Mixin.create(WithVisibilityDetection, {
   },
 
   actions: {
-    willTransition() {
-      this.cancelAllWatchers();
+    willTransition(transition) {
+      // Don't cancel watchers if transitioning into a sub-route
+      if (!transition.intent.name.startsWith(this.routeName)) {
+        this.cancelAllWatchers();
+      }
 
       // Bubble the action up to the application route
       return true;