Merge branch 'add-offset-to-$anchorScroll' of https://github.com/gkalpak/angular.js into add-offset-to-$anchorScroll

gkalpak · gkalpak · commit f19163a6f703 · 2014-10-03T09:25:54.000+03:00
diff --git a/docs/app/src/app.js b/docs/app/src/app.js
@@ -13,11 +13,10 @@ angular.module('docsApp', [
   'search',
   'tutorials',
   'versions',
-  'scrollOffset',
   'bootstrap',
   'ui.bootstrap.dropdown'
 ])
 
 .config(['$locationProvider', function($locationProvider) {
   $locationProvider.html5Mode(true).hashPrefix('!');
-}]);
+}]);
diff --git a/docs/app/src/directives.js b/docs/app/src/directives.js
@@ -28,4 +28,10 @@ angular.module('directives', [])
       element.html(window.prettyPrintOne(html, lang, linenums));
     }
   };
-});
+})
+
+.directive('scrollYOffsetElement', ['$anchorScroll', function($anchorScroll) {
+  return function(scope, element) {
+    $anchorScroll.yOffset = element;
+  };
+}]);
diff --git a/docs/app/src/scroll-offset.js b/docs/app/src/scroll-offset.js
diff --git a/docs/config/templates/indexPage.template.html b/docs/config/templates/indexPage.template.html
@@ -70,7 +70,7 @@
 </head>
 <body>
   <div id="wrapper">
-    <header class="header header-fixed" scroll-offset-element>
+    <header scroll-y-offset-element class="header header-fixed">
       <section class="navbar navbar-inverse docs-navbar-primary" ng-controller="DocsSearchCtrl">
         <div class="container">
           <div class="row">
diff --git a/src/ng/anchorScroll.js b/src/ng/anchorScroll.js
@@ -116,23 +116,12 @@ function $AnchorScrollProvider() {
 // TODO(gkalpak): The $anchorScrollProvider should be documented as well
 //                (under the providers section).
 
-  var DEFAULT_OFFSET = 0;
-
   var autoScrollingEnabled = true;
-  var scrollOffsetGetter = function() { return DEFAULT_OFFSET; };
 
   this.disableAutoScrolling = function() {
     autoScrollingEnabled = false;
   };
 
-  this.setScrollOffset = function(newScrollOffset) {
-    if (isFunction(newScrollOffset)) {
-      scrollOffsetGetter = function() { return newScrollOffset(); };
-    } else if (isNumber(newScrollOffset)) {
-      scrollOffsetGetter = function() { return newScrollOffset; };
-    }
-  };
-
   this.$get = ['$window', '$location', '$rootScope', function($window, $location, $rootScope) {
     var document = $window.document;
 
@@ -148,14 +137,33 @@ function $AnchorScrollProvider() {
       return result;
     }
 
+    function getYOffset() {
+
+      var offset = scroll.yOffset;
+
+      if (isElement(offset)) {
+
+        var style = $window.getComputedStyle(scroll.yOffset[0]);
+        var top = parseInt(style.top,10);
+        var height = parseInt(style.height,10);
+        return style.position === 'fixed' ? (top + height) : 0;
+
+      } else if (isFunction(offset)) {
+        return offset();
+
+      } else if (isNumber(offset)) {
+        return offset;
+
+      } else {
+        return 0;
+      }
+
+    }
+
     function scrollTo(elem) {
       if (elem) {
         elem.scrollIntoView();
-        var offset = scrollOffsetGetter();
-        var actualOffset = offset && (offset - (elem.offsetTop - document.body.scrollTop));
-        if (actualOffset) {
-          $window.scrollBy(0, -1 * actualOffset);
-        }
+        $window.scrollBy(0, -1 * getYOffset());
       } else {
         $window.scrollTo(0, 0);
       }
diff --git a/test/ng/anchorScrollSpec.js b/test/ng/anchorScrollSpec.js
@@ -52,6 +52,7 @@ describe('$anchorScroll', function() {
     elmSpy = {};
     $provide.value('$window', {
       scrollTo: jasmine.createSpy('$window.scrollTo'),
+      scrollBy: jasmine.createSpy('$window.scrollBy'),
       document: document,
       navigator: {}
     });
