Use _routerMicrolib instead of router when available

kiwi-josh · May 2, 2017 · 79c33ce · 79c33ce
1 parent 4ccfa07
commit 79c33ce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/addon/helpers/href-to.js b/addon/helpers/href-to.js
@@ -4,7 +4,8 @@ const { getOwner } = Em;
 
 function hrefTo(context, targetRouteName, ...rest) {
   let router = getOwner(context).lookup('router:main');
-  if (router === undefined || router.router === undefined) {
+  if (router === undefined ||
+      (router._routerMicrolib === undefined && router.router === undefined)) {
     return;
   }
 

diff --git a/addon/href-to.js b/addon/href-to.js
@@ -29,9 +29,10 @@ export default class {
   handle() {
     let router = this._getRouter();
     let urlWithoutRoot = this.getUrlWithoutRoot();
+    let routerMicrolib = router._routerMicrolib || router.router;
 
     router.handleURL(urlWithoutRoot);
-    router.router.updateURL(urlWithoutRoot);
+    routerMicrolib.updateURL(urlWithoutRoot);
     this.event.preventDefault();
   }
 
@@ -78,8 +79,9 @@ export default class {
       let rootUrl = this._getRootUrl();
       let isInternal = url.indexOf(rootUrl) === 0;
       let urlWithoutRoot = this.getUrlWithoutRoot();
+      let routerMicrolib = router._routerMicrolib || router.router;
 
-      didRecognize = isInternal && router.router.recognizer.recognize(urlWithoutRoot);
+      didRecognize = isInternal && routerMicrolib.recognizer.recognize(urlWithoutRoot);
     }
 
     return didRecognize;