Skip to content

Commit

Permalink
Released v0.6.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
oblador committed Jul 9, 2014
1 parent 4b90f5b commit 2991490
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 8 deletions.
18 changes: 14 additions & 4 deletions angular-scroll.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,19 @@ angular.module('duScroll.scrollHelpers', []).run([
}
var startLeft = this.scrollLeft(), startTop = this.scrollTop(), deltaLeft = Math.round(left - startLeft), deltaTop = Math.round(top - startTop);
var startTime = null;
var el = this;
var cancelOnEvents = 'scroll mousedown mousewheel touchmove keydown';
var cancelScrollAnimation = function ($event) {
if (!$event || $event.which > 0) {
el.unbind(cancelOnEvents, cancelScrollAnimation);
cancelAnimation(scrollAnimation);
deferred.reject();
scrollAnimation = null;
}
};
if (scrollAnimation) {
cancelAnimation(scrollAnimation);
deferred.reject();
cancelScrollAnimation();
}
var el = this;
deferred = $q.defer();
if (!deltaLeft && !deltaTop) {
deferred.resolve();
Expand All @@ -78,12 +86,14 @@ angular.module('duScroll.scrollHelpers', []).run([
if (percent < 1) {
scrollAnimation = requestAnimation(animationStep);
} else {
el.unbind(cancelOnEvents, cancelScrollAnimation);
scrollAnimation = null;
deferred.resolve();
}
};
//Fix random mobile safari bug when scrolling to top by hitting status bar
el.scrollTo(startLeft, startTop);
el.bind(cancelOnEvents, cancelScrollAnimation);
scrollAnimation = requestAnimation(animationStep);
return deferred.promise;
};
Expand Down Expand Up @@ -117,7 +127,7 @@ angular.module('duScroll.scrollHelpers', []).run([
return el.scrollTop;
}
};
//Add duration and easing functionality to existing jQuery getter/setters
//Add duration and easing functionality to existing jQuery getter/setters
var overloadScrollPos = function (superFn, overloadFn) {
return function (value, duration, easing) {
if (duration) {
Expand Down
2 changes: 1 addition & 1 deletion angular-scroll.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2991490

Please sign in to comment.