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.

3 files changed, 21 insertions, 19 deletions

diff --git a/src/AngularPublic.js b/src/AngularPublic.js
index 4973f574..3614eb9a 100644
--- a/src/AngularPublic.js
+++ b/src/AngularPublic.js
@@ -66,7 +66,7 @@ function publishExternalAPI(angular){
       $provide.value('$directive', angularDirective);
       $provide.value('$widget', angularWidget);
 
-      $provide.service('$autoScroll', $AutoScrollProvider);
+      $provide.service('$anchorScroll', $AnchorScrollProvider);
       $provide.service('$browser', $BrowserProvider);
       $provide.service('$cacheFactory', $CacheFactoryProvider);
       $provide.service('$compile', $CompileProvider);
diff --git a/src/service/autoScroll.js b/src/service/anchorScroll.js
index 223400f4..19a09498 100644
--- a/src/service/autoScroll.js
+++ b/src/service/anchorScroll.js
@@ -1,6 +1,6 @@
 /**
  * @ngdoc function
- * @name angular.module.ng.$autoScroll
+ * @name angular.module.ng.$anchorScroll
  * @requires $window
  * @requires $location
  * @requires $rootScope
@@ -11,14 +11,14 @@
  * {@link http://dev.w3.org/html5/spec/Overview.html#the-indicated-part-of-the-document Html5 spec}.
  *
  * It also watches the `$location.hash()` and scroll whenever it changes to match any anchor.
- *
- * You can disable `$autoScroll` service by calling `disable()` on `$autoScrollProvider`.
- * Note: disabling is only possible before the service is instantiated !
+ * This can be disabled by calling `$anchorScrollProvider.disableAutoScrolling()`.
  */
-function $AutoScrollProvider() {
+function $AnchorScrollProvider() {
+
+  var autoScrollingEnabled = true;
 
-  this.disable = function() {
-    this.$get = function() {return noop;};
+  this.disableAutoScrolling = function() {
+    autoScrollingEnabled = false;
   };
 
   this.$get = ['$window', '$location', '$rootScope', function($window, $location, $rootScope) {
@@ -54,9 +54,11 @@ function $AutoScrollProvider() {
 
     // does not scroll when user clicks on anchor link that is currently on
     // (no url change, no $locaiton.hash() change), browser native does scroll
-    $rootScope.$watch(function() {return $location.hash();}, function() {
-      $rootScope.$evalAsync(scroll);
-    });
+    if (autoScrollingEnabled) {
+      $rootScope.$watch(function() {return $location.hash();}, function() {
+        $rootScope.$evalAsync(scroll);
+      });
+    }
 
     return scroll;
   }];
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 {