fix(goUpControl): fix incorrect labeling logic

sofa · Feb 11, 2014 · 2b7f73a · 2b7f73a
1 parent 1b7b120
commit 2b7f73a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dist/cc.angular.js b/dist/cc.angular.js
@@ -2877,8 +2877,8 @@ angular.module('sdk.directives.ccGoUpControl')
             link: function($scope, element, attributes){
 
                 $scope.getParentLabel = function () {
-                    return $scope.category.parent && $scope.category.parent.parent ? $scope.category.parent.label :
-                           $scope.category.parent ? $scope.homeText : '';
+                    return $scope.category.parent && !$scope.category.parent.isRoot ? $scope.category.parent.label :
+                           $scope.category.parent && $scope.category.parent.isRoot ? $scope.homeText : '';
                 };
             }
         };

diff --git a/src/directives/ccGoUpControl/ccGoUpControl.js b/src/directives/ccGoUpControl/ccGoUpControl.js
@@ -20,8 +20,8 @@ angular.module('sdk.directives.ccGoUpControl')
             link: function($scope, element, attributes){
 
                 $scope.getParentLabel = function () {
-                    return $scope.category.parent && $scope.category.parent.parent ? $scope.category.parent.label :
-                           $scope.category.parent ? $scope.homeText : '';
+                    return $scope.category.parent && !$scope.category.parent.isRoot ? $scope.category.parent.label :
+                           $scope.category.parent && $scope.category.parent.isRoot ? $scope.homeText : '';
                 };
             }
         };