make sure _isActive returns boolean in link-to

emberjs · Oct 28, 2017 · 5b215f7 · 5b215f7
1 parent 3942c5a
commit 5b215f7
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/packages/ember-glimmer/lib/components/link-to.ts b/packages/ember-glimmer/lib/components/link-to.ts
@@ -556,19 +556,18 @@ const LinkComponent = EmberComponent.extend({
   _isActive(routerState) {
     if (get(this, 'loading')) { return false; }
 
-    let routing = get(this, '_routing');
-    let models = get(this, 'models');
-    let resolvedQueryParams = get(this, 'resolvedQueryParams');
     let currentWhen = get(this, 'current-when');
 
-    if (typeof currentWhen === 'boolean') {
-      return currentWhen ? get(this, 'activeClass') : false;
-    }
+    if (typeof currentWhen === 'boolean') { return currentWhen; }
 
     let isCurrentWhenSpecified = !!currentWhen;
     currentWhen = currentWhen || get(this, 'qualifiedRouteName');
     currentWhen = currentWhen.split(' ');
 
+    let routing = get(this, '_routing');
+    let models = get(this, 'models');
+    let resolvedQueryParams = get(this, 'resolvedQueryParams');
+
     for (let i = 0; i < currentWhen.length; i++) {
       if (routing.isActiveForRoute(models, resolvedQueryParams, currentWhen[i], routerState, isCurrentWhenSpecified)) {
         return true;