diff options
| author | Vojta Jina | 2012-01-12 03:00:34 -0800 |
|---|---|---|
| committer | Vojta Jina | 2012-01-13 01:07:12 -0800 |
| commit | 15fd735793cffe89fdf9662275409cdcdb3e801a (patch) | |
| tree | ce5699ab3375d41cfcffb88ed93236b7ff96a366 /src/widgets.js | |
| parent | 985d3d75586a16020d78564753f9b46ec9091929 (diff) | |
| download | angular.js-15fd735793cffe89fdf9662275409cdcdb3e801a.tar.bz2 | |
refactor($autoScroll): rename to $anchorScroll and allow disabling auto scrolling (links)
Now, that we have autoscroll attribute on ng:include, there is no reason to disable the service completely, so $anchorScrollProvider.disableAutoScrolling() means it won't be scrolling when $location.hash() changes.
And then, it's not $autoScroll at all, it actually scrolls to anchor when it's called, so I renamed
it to $anchorScroll.
Diffstat (limited to 'src/widgets.js')
| -rw-r--r-- | src/widgets.js | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/widgets.js b/src/widgets.js index 63ddaf36..09a800de 100644 --- a/src/widgets.js +++ b/src/widgets.js @@ -43,8 +43,8 @@ * instance of angular.module.ng.$rootScope.Scope to set the HTML fragment to. * @param {string=} onload Expression to evaluate when a new partial is loaded. * - * @param {string=} autoscroll Whether `ng:include` should call {@link angular.module.ng.$autoScroll - * $autoScroll} to scroll the viewport after the content is loaded. + * @param {string=} autoscroll Whether `ng:include` should call {@link angular.module.ng.$anchorScroll + * $anchorScroll} to scroll the viewport after the content is loaded. * * - If the attribute is not set, disable scrolling. * - If the attribute is set without value, enable scrolling. @@ -99,8 +99,8 @@ angularWidget('ng:include', function(element){ this.directives(true); } else { element[0]['ng:compiled'] = true; - return ['$http', '$templateCache', '$autoScroll', '$element', - function($http, $templateCache, $autoScroll, element) { + return ['$http', '$templateCache', '$anchorScroll', '$element', + function($http, $templateCache, $anchorScroll, element) { var scope = this, changeCounter = 0, childScope; @@ -133,7 +133,7 @@ angularWidget('ng:include', function(element){ childScope = useScope ? useScope : scope.$new(); compiler.compile(element)(childScope); if (isDefined(autoScrollExp) && (!autoScrollExp || scope.$eval(autoScrollExp))) { - $autoScroll(); + $anchorScroll(); } scope.$eval(onloadExp); } @@ -568,8 +568,8 @@ angularWidget('ng:view', function(element) { if (!element[0]['ng:compiled']) { element[0]['ng:compiled'] = true; - return ['$http', '$templateCache', '$route', '$autoScroll', '$element', - function($http, $templateCache, $route, $autoScroll, element) { + return ['$http', '$templateCache', '$route', '$anchorScroll', '$element', + function($http, $templateCache, $route, $anchorScroll, element) { var template; var changeCounter = 0; @@ -593,7 +593,7 @@ angularWidget('ng:view', function(element) { if (newChangeCounter == changeCounter) { element.html(response); compiler.compile(element)($route.current.scope); - $autoScroll(); + $anchorScroll(); } }).error(clearContent); } else { |
