Refactored init code.

oblador · Mar 28, 2014 · b4d2adf · b4d2adf
1 parent f4f78ef
commit b4d2adf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 20 deletions.
diff --git a/angular-scroll.js b/angular-scroll.js
@@ -35,8 +35,8 @@ factory('scrollPosition',
     };
 
     var observers = [];
-    var lastScrollY = getScrollY();
-    var currentScrollY = 0;
+    var lastScrollY;
+    var currentScrollY;
 
     var executeCallbacks = function(){
       currentScrollY = lastScrollY;
@@ -54,13 +54,7 @@ factory('scrollPosition',
       }
     };
 
-    angular.element($document).on('scroll', onScroll);
-    //Init
-    executeCallbacks();
-    //Redo init after reflows and initial anchor jump
-    angular.element($window).on('load', function() {
-      $timeout(executeCallbacks, 10);
-    });
+    angular.element($document).on('scroll', onScroll).triggerHandler('scroll');
 
     var deprecationWarned = false;
     return {

diff --git a/angular-scroll.min.js b/angular-scroll.min.js
diff --git a/angular-scroll.min.js.map b/angular-scroll.min.js.map