diff --git a/docs/app/src/app.js b/docs/app/src/app.js index 11ac6fda73de..7285aa8ccdd8 100644 --- 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('!'); -}]); +}]); \ No newline at end of file diff --git a/docs/app/src/directives.js b/docs/app/src/directives.js index 6ad4f6a38f23..4c3acf781000 100644 --- 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 deleted file mode 100644 index 342eacdb5d35..000000000000 --- a/docs/app/src/scroll-offset.js +++ /dev/null @@ -1,39 +0,0 @@ -angular.module('scrollOffset', []) - -/** - * scrollOffsetElement Directive - * - * @description Store the element whose height should be used to determine the scroll offset and its - * computed style. - */ -.directive('scrollOffsetElement', ['$window', 'SCROLL_OFFSET_ELEMENT', - function scrollOffsetElementDirective($window, SCROLL_OFFSET_ELEMENT) { - return { - restrict: 'A', - link: function scrollOffsetElementPostLink(scope, elem) { - elem = elem[0]; - SCROLL_OFFSET_ELEMENT.element = elem; - SCROLL_OFFSET_ELEMENT.computedStyle = $window.getComputedStyle(elem); - // README: Using `getComputedStyle()` renders this approach incompatible with IE8. - } - }; - } -]) - -.constant('SCROLL_OFFSET_ELEMENT', { - element: null, // README: This is not used, but keeping it here just in case... - computedStyle: null -}) - -.config(['$anchorScrollProvider', 'SCROLL_OFFSET_ELEMENT', - function($anchorScrollProvider, SCROLL_OFFSET_ELEMENT) { - var extraTopSpace = 15; - $anchorScrollProvider.setScrollOffset(function () { - var computedStyle = SCROLL_OFFSET_ELEMENT.computedStyle; - - if (!computedStyle || (computedStyle.position !== 'fixed')) return 0; - - return parseInt(computedStyle.height, 10) + extraTopSpace; - }); - } -]); diff --git a/docs/config/templates/indexPage.template.html b/docs/config/templates/indexPage.template.html index 720518f77db2..c72d7a4c703e 100644 --- a/docs/config/templates/indexPage.template.html +++ b/docs/config/templates/indexPage.template.html @@ -70,7 +70,7 @@
-
+
diff --git a/src/ng/anchorScroll.js b/src/ng/anchorScroll.js index 1592a1ba8093..5297aaef2457 100644 --- 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 index e7933d630195..8612da299970 100644 --- 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: {} });