Skip to content

Commit 0bd6988

Browse files
author
Brandon Barker
committed
Rebuild dist and bump version
1 parent ef62330 commit 0bd6988

File tree

4 files changed

+19
-6
lines changed

4 files changed

+19
-6
lines changed

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-scroll-when",
3-
"version": "1.0.3",
3+
"version": "1.0.4",
44
"authors": [
55
"Brandon Barker <[email protected]>"
66
],

dist/angular-scroll-when.js

+15-2
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,27 @@
2727
var scrollSpeed = attrs.scrollSpeed || 500;
2828
var scrollOffset = attrs.scrollOffset || 600;
2929
var $element = $(scrollContainer);
30-
var scrollPos = element[0].offsetTop - scrollOffset;
31-
doScroll($element, scrollPos, scrollSpeed);
30+
var scrollPos = getPosition(element[0]);
31+
doScroll($element, scrollPos.y - scrollOffset, scrollSpeed);
3232
}
3333
}
3434
// Scroll to the element
3535
function doScroll($element, scrollPos, scrollSpeed) {
3636
$element.animate({ scrollTop: scrollPos }, scrollSpeed);
3737
}
38+
function getPosition(element) {
39+
var x = 0;
40+
var y = 0;
41+
while (element) {
42+
x += element.offsetLeft - element.scrollLeft + element.clientLeft;
43+
y += element.offsetTop - element.scrollTop + element.clientTop;
44+
element = element.offsetParent;
45+
}
46+
return {
47+
x: x,
48+
y: y
49+
};
50+
}
3851
}
3952
};
4053
}

dist/angular-scroll-when.min.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**
22
* angular-scroll-when
3-
* @version v1.0.1 - 2014-12-15
3+
* @version v1.0.4 - 2015-04-20
44
* @link https://github.com/brandon-barker/angular-scroll-when
55
* @author Brandon Barker <[email protected]>
66
* @license MIT License, http://www.opensource.org/licenses/MIT
77
*/
8-
!function(){"use strict";function a(a){return{restrict:"A",link:function(b,c,d){function e(){if(b.$eval(d.scrollWhen)){var a=d.scrollContainer||"body",e=d.scrollSpeed||500,g=d.scrollOffset||600,h=$(a),i=c[0].offsetTop-g;f(h,i,e)}}function f(a,b,c){a.animate({scrollTop:b},c)}var g="true"===d.scrollWatchEnabled;a(function(){e()},0),g&&b.$watch(d.scrollWhen,function(a,b){a!==b&&e()})}}}angular.module("bb.scrollWhen",[]),angular.module("bb.scrollWhen").directive("scrollWhen",a),a.$inject=["$timeout"]}();
8+
!function(){"use strict";function a(a){return{restrict:"A",link:function(b,c,d){function e(){if(b.$eval(d.scrollWhen)){var a=d.scrollContainer||"body",e=d.scrollSpeed||500,h=d.scrollOffset||600,i=$(a),j=g(c[0]);f(i,j.y-h,e)}}function f(a,b,c){a.animate({scrollTop:b},c)}function g(a){for(var b=0,c=0;a;)b+=a.offsetLeft-a.scrollLeft+a.clientLeft,c+=a.offsetTop-a.scrollTop+a.clientTop,a=a.offsetParent;return{x:b,y:c}}var h="true"===d.scrollWatchEnabled;a(function(){e()},0),h&&b.$watch(d.scrollWhen,function(a,b){a!==b&&e()})}}}angular.module("bb.scrollWhen",[]),angular.module("bb.scrollWhen").directive("scrollWhen",a),a.$inject=["$timeout"]}();

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-scroll-when",
3-
"version": "1.0.1",
3+
"version": "1.0.4",
44
"description": "An Angular directive to dynamically scroll to any element on your page",
55
"keywords": [
66
"angular",

0 commit comments

Comments
 (0)