fix(uiView): Do NOT autoscroll when autoscroll attr is missing

Breaking Change: If you had ui-views that you wanted to autoscroll to on state change, you may now need to explicitly add `autoscroll="true"`. Fixes #807
angular-ui · Mar 6, 2014 · 126e2a5 · 126e2a5
1 parent cb1c9cf
commit 126e2a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/viewDirective.js b/src/viewDirective.js
@@ -278,7 +278,7 @@ function $ViewDirective(   $state,   $compile,   $controller,   $injector,   $ui
           currentScope.$emit('$viewContentLoaded');
           if (onloadExp) currentScope.$eval(onloadExp);
 
-          if (!angular.isDefined(autoscrollExp) || !autoscrollExp || $scope.$eval(autoscrollExp)) {
+          if (angular.isDefined(autoscrollExp) && !autoscrollExp || $scope.$eval(autoscrollExp)) {
             $uiViewScroll(currentEl);
           }
         }

diff --git a/test/viewDirectiveSpec.js b/test/viewDirectiveSpec.js
@@ -278,12 +278,12 @@ describe('uiView', function () {
   });
 
   describe('autoscroll attribute', function () {
-    it('should autoscroll when unspecified', inject(function ($state, $q, $uiViewScroll, $animate) {
+    it('should NOT autoscroll when unspecified', inject(function ($state, $q, $uiViewScroll, $animate) {
       elem.append($compile('<div><ui-view></ui-view></div>')(scope));
       $state.transitionTo(aState);
       $q.flush();
       if ($animate) $animate.flush();
-      expect($uiViewScroll).toHaveBeenCalledWith(elem.find('span').parent());
+      expect($uiViewScroll).not.toHaveBeenCalledWith(elem.find('span').parent());
     }));
 
     it('should autoscroll when expression is missing', inject(function ($state, $q, $uiViewScroll, $animate) {