Released 0.5.7.

oblador · May 23, 2014 · 119697b · 119697b
1 parent f5923ec
commit 119697b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git 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,15 +57,17 @@ 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);
         deferred.reject();
       }
       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