fix(uiView): it should autoscroll when expr is missing.

angular-ui · Dec 23, 2013 · 8bb9e27 · 8bb9e27
1 parent 5fd1efc
commit 8bb9e27
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/viewDirective.js b/src/viewDirective.js
@@ -11,7 +11,7 @@
  * @restrict ECA
  *
  * @description
- * The ui-view directive tells $state where to place your templates. 
+ * The ui-view directive tells $state where to place your templates.
  * A view can be unnamed or named.
  *
  * @param {string} ui-view A view name.
@@ -123,7 +123,7 @@ function $ViewDirective(   $state,   $compile,   $controller,   $injector,   $an
 
           // TODO: This seems strange, shouldn't $anchorScroll listen for $viewContentLoaded if necessary?
           // $anchorScroll might listen on event...
-          if (!angular.isDefined(attr.autoscroll) || scope.$eval(attr.autoscroll)) {
+          if (!angular.isDefined(attr.autoscroll) || (!attr.autoscroll || scope.$eval(attr.autoscroll))) {
             $anchorScroll();
           }
         }

diff --git a/test/viewDirectiveSpec.js b/test/viewDirectiveSpec.js
@@ -216,13 +216,20 @@ describe('uiView', function () {
   });
 
   describe('autoscroll attribute', function () {
-    it('should autoscroll when missing', inject(function ($state, $q, $anchorScroll) {
+    it('should autoscroll when unspecified', inject(function ($state, $q, $anchorScroll) {
       elem.append($compile('<div ui-view></div>')(scope));
       $state.transitionTo(gState);
       $q.flush();
       expect($anchorScroll).toHaveBeenCalled();
     }));
 
+    it('should autoscroll when expr is missing', inject(function ($state, $q, $anchorScroll) {
+      elem.append($compile('<div ui-view autoscroll></div>')(scope));
+      $state.transitionTo(gState);
+      $q.flush();
+      expect($anchorScroll).toHaveBeenCalled();
+    }));
+
     it('should autoscroll when truthy', inject(function ($state, $q, $anchorScroll) {
       elem.append($compile('<div ui-view autoscroll="true"></div>')(scope));
       $state.transitionTo(gState);