diff --git a/angular-scroll.js b/angular-scroll.js index 8cb52f7..0913a11 100644 --- a/angular-scroll.js +++ b/angular-scroll.js @@ -13,7 +13,7 @@ angular.module('duScroll', [ 'duScroll.smoothScroll', 'duScroll.scrollContainer', 'duScroll.scrollHelpers' -]).value('duScrollDuration', 350).value('duScrollEasing', duScrollDefaultEasing); +]).value('duScrollDuration', 350).value('duScrollGreedy', false).value('duScrollEasing', duScrollDefaultEasing); angular.module('duScroll.scrollHelpers', []).run([ '$window', '$q', @@ -57,8 +57,6 @@ angular.module('duScroll.scrollHelpers', []).run([ easing = duScrollEasing; } var startLeft = this.scrollLeft(), startTop = this.scrollTop(), deltaLeft = Math.round(left - startLeft), deltaTop = Math.round(top - startTop); - if (!deltaLeft && !deltaTop) - return; var startTime = null; if (scrollAnimation) { cancelAnimation(scrollAnimation); @@ -66,6 +64,10 @@ angular.module('duScroll.scrollHelpers', []).run([ } var el = this; deferred = $q.defer(); + if (!deltaLeft && !deltaTop) { + deferred.resolve(); + return deferred.promise; + } var animationStep = function (timestamp) { if (startTime === null) { startTime = timestamp; @@ -80,6 +82,8 @@ angular.module('duScroll.scrollHelpers', []).run([ deferred.resolve(); } }; + //Fix random mobile safari bug when scrolling to top by hitting status bar + el.scrollTo(startLeft, startTop); scrollAnimation = requestAnimation(animationStep); return deferred.promise; }; @@ -181,7 +185,8 @@ angular.module('duScroll.requestAnimation', ['duScroll.polyfill']).factory('requ angular.module('duScroll.spyAPI', ['duScroll.scrollContainerAPI']).factory('spyAPI', [ '$rootScope', 'scrollContainerAPI', - function ($rootScope, scrollContainerAPI) { + 'duScrollGreedy', + function ($rootScope, scrollContainerAPI, duScrollGreedy) { var createScrollHandler = function (context) { return function () { var container = context.container, containerEl = container[0], containerOffset = 0; @@ -209,7 +214,7 @@ angular.module('duScroll.spyAPI', ['duScroll.scrollContainerAPI']).factory('spyA if (toBeActive) { toBeActive = toBeActive.spy; } - if (currentlyActive === toBeActive) + if (currentlyActive === toBeActive || duScrollGreedy && !toBeActive) return; if (currentlyActive) { currentlyActive.$element.removeClass('active'); diff --git a/angular-scroll.min.js b/angular-scroll.min.js index 53f3304..d979dfe 100644 --- a/angular-scroll.min.js +++ b/angular-scroll.min.js @@ -1 +1 @@ -var duScrollDefaultEasing=function(t){return.5>t?Math.pow(2*t,2)/2:1-Math.pow(2*(1-t),2)/2};angular.module("duScroll",["duScroll.scrollspy","duScroll.requestAnimation","duScroll.smoothScroll","duScroll.scrollContainer","duScroll.scrollHelpers"]).value("duScrollDuration",350).value("duScrollEasing",duScrollDefaultEasing),angular.module("duScroll.scrollHelpers",[]).run(["$window","$q","cancelAnimation","requestAnimation","duScrollEasing",function(t,e,n,r,o){var l=angular.element.prototype;this.$get=function(){return l};var i=function(t){return"undefined"!=typeof HTMLDocument&&t instanceof HTMLDocument||t.nodeType&&t.nodeType===t.DOCUMENT_NODE},c=function(t){return"undefined"!=typeof HTMLElement&&t instanceof HTMLElement||t.nodeType&&t.nodeType===t.ELEMENT_NODE},u=function(t){return c(t)||i(t)?t:t[0]};l.scrollTo=function(e,n,r){var o;if(angular.isElement(e)?o=this.scrollToElement:r&&(o=this.scrollToAnimated),o)return o.apply(this,arguments);var l=u(this);return i(l)?t.scrollTo(e,n):(l.scrollLeft=e,void(l.scrollTop=n))};var a,s;l.scrollToAnimated=function(t,l,i,c){i&&!c&&(c=o);var u=this.scrollLeft(),d=this.scrollTop(),f=Math.round(t-u),p=Math.round(l-d);if(f||p){var m=null;a&&(n(a),s.reject());var g=this;s=e.defer();var v=function(t){null===m&&(m=t);var e=t-m,n=e>=i?1:c(e/i);g.scrollTo(u+Math.ceil(f*n),d+Math.ceil(p*n)),1>n?a=r(v):(a=null,s.resolve())};return a=r(v),s.promise}},l.scrollToElement=function(t,e,n,r){var o=u(this),l=this.scrollTop()+u(t).getBoundingClientRect().top-e;return c(o)&&(l-=o.getBoundingClientRect().top),this.scrollTo(0,l,n,r)};var d={scrollLeft:function(e,n,r){if(angular.isNumber(e))return this.scrollTo(e,this.scrollTop(),n,r);var o=u(this);return i(o)?t.scrollX||document.documentElement.scrollLeft||document.body.scrollLeft:o.scrollLeft},scrollTop:function(e,n,r){if(angular.isNumber(e))return this.scrollTo(this.scrollTop(),e,n,r);var o=u(this);return i(o)?t.scrollY||document.documentElement.scrollTop||document.body.scrollTop:o.scrollTop}},f=function(t,e){return function(n,r){return r?e.apply(this,arguments):t.apply(this,arguments)}};for(var p in d)l[p]=l[p]?f(l[p],d[p]):d[p]}]),angular.module("duScroll.polyfill",[]).factory("polyfill",["$window",function(t){var e=["webkit","moz","o","ms"];return function(n,r){if(t[n])return t[n];for(var o,l=n.substr(0,1).toUpperCase()+n.substr(1),i=0;ie?Math.pow(2*e,2)/2:1-Math.pow(2*(1-e),2)/2};angular.module("duScroll",["duScroll.scrollspy","duScroll.requestAnimation","duScroll.smoothScroll","duScroll.scrollContainer","duScroll.scrollHelpers"]).value("duScrollDuration",350).value("duScrollGreedy",!1).value("duScrollEasing",duScrollDefaultEasing),angular.module("duScroll.scrollHelpers",[]).run(["$window","$q","cancelAnimation","requestAnimation","duScrollEasing",function(e,t,n,r,o){var l=angular.element.prototype;this.$get=function(){return l};var i=function(e){return"undefined"!=typeof HTMLDocument&&e instanceof HTMLDocument||e.nodeType&&e.nodeType===e.DOCUMENT_NODE},u=function(e){return"undefined"!=typeof HTMLElement&&e instanceof HTMLElement||e.nodeType&&e.nodeType===e.ELEMENT_NODE},c=function(e){return u(e)||i(e)?e:e[0]};l.scrollTo=function(t,n,r){var o;if(angular.isElement(t)?o=this.scrollToElement:r&&(o=this.scrollToAnimated),o)return o.apply(this,arguments);var l=c(this);return i(l)?e.scrollTo(t,n):(l.scrollLeft=t,void(l.scrollTop=n))};var a,s;l.scrollToAnimated=function(e,l,i,u){i&&!u&&(u=o);var c=this.scrollLeft(),d=this.scrollTop(),f=Math.round(e-c),p=Math.round(l-d),m=null;a&&(n(a),s.reject());var g=this;if(s=t.defer(),!f&&!p)return s.resolve(),s.promise;var v=function(e){null===m&&(m=e);var t=e-m,n=t>=i?1:u(t/i);g.scrollTo(c+Math.ceil(f*n),d+Math.ceil(p*n)),1>n?a=r(v):(a=null,s.resolve())};return g.scrollTo(c,d),a=r(v),s.promise},l.scrollToElement=function(e,t,n,r){var o=c(this),l=this.scrollTop()+c(e).getBoundingClientRect().top-t;return u(o)&&(l-=o.getBoundingClientRect().top),this.scrollTo(0,l,n,r)};var d={scrollLeft:function(t,n,r){if(angular.isNumber(t))return this.scrollTo(t,this.scrollTop(),n,r);var o=c(this);return i(o)?e.scrollX||document.documentElement.scrollLeft||document.body.scrollLeft:o.scrollLeft},scrollTop:function(t,n,r){if(angular.isNumber(t))return this.scrollTo(this.scrollTop(),t,n,r);var o=c(this);return i(o)?e.scrollY||document.documentElement.scrollTop||document.body.scrollTop:o.scrollTop}},f=function(e,t){return function(n,r){return r?t.apply(this,arguments):e.apply(this,arguments)}};for(var p in d)l[p]=l[p]?f(l[p],d[p]):d[p]}]),angular.module("duScroll.polyfill",[]).factory("polyfill",["$window",function(e){var t=["webkit","moz","o","ms"];return function(n,r){if(e[n])return e[n];for(var o,l=n.substr(0,1).toUpperCase()+n.substr(1),i=0;i