From f2d2bf303e56af00990c15d10ef107d271af18f0 Mon Sep 17 00:00:00 2001 From: Joel Arvidsson Date: Sun, 6 Oct 2013 13:06:59 +0200 Subject: [PATCH] Renamed listen to observe. --- README.md | 2 +- angular-scroll.js | 10 +++++----- angular-scroll.min.js | 2 +- angular-scroll.min.js.map | 2 +- src/services/scroll-position.js | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 5b960f3..73ab3f7 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Usage ```js angular.module('myApp', ['duScroll']). controller('myCtrl', function($scope, scrollPosition){ - scrollPosition.listen(function(scrollY) { + scrollPosition.observe(function(scrollY) { console.log('Scrolled to ', scrollY); }); } diff --git a/angular-scroll.js b/angular-scroll.js index 417e0f3..48fd1a4 100644 --- a/angular-scroll.js +++ b/angular-scroll.js @@ -16,14 +16,14 @@ factory('requestAnimation', function($window, $timeout) { angular.module('duScroll.scrollPosition', ['duScroll.requestAnimation']). factory('scrollPosition', function($window, requestAnimation) { - var listeners = []; + var observers = []; var lastScrollY = 0; var currentScrollY = 0; var executeCallbacks = function(scrollY){ currentScrollY = lastScrollY; - for(var i = 0; i < listeners.length; i++){ - listeners[i](currentScrollY); + for(var i = 0; i < observers.length; i++){ + observers[i](currentScrollY); } }; @@ -36,8 +36,8 @@ factory('scrollPosition', }); return { - listen : function(cb){ - listeners.push(cb); + observe : function(cb){ + observers.push(cb); } }; }); diff --git a/angular-scroll.min.js b/angular-scroll.min.js index f2fc82e..888bb91 100644 --- a/angular-scroll.min.js +++ b/angular-scroll.min.js @@ -1,2 +1,2 @@ -angular.module("duScroll",["duScroll.scroller","duScroll.scrollPosition","duScroll.requestAnimation","duScroll.smoothScroll"]),angular.module("duScroll.requestAnimation",[]).factory("requestAnimation",["$window","$timeout",function(a,b){return a.requestAnimationFrame||a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame||a.msRequestAnimationFrame||function(a){b(a,1e3/60)}}]),angular.module("duScroll.scrollPosition",["duScroll.requestAnimation"]).factory("scrollPosition",["$window","requestAnimation",function(a,b){var c=[],d=0,e=0,f=function(){e=d;for(var a=0;ai&&b(k)};k()}function e(b,c,e){d(a.scrollX+(b||0),a.scrollY+(c||0),e)}return{scrollTo:d,scrollDelta:e}}]),angular.module("duScroll.smoothScroll",["duScroll.scroller"]).directive("smoothScroll",["scroller",function(a){return{link:function(b,c,d){var e=angular.element(c[0]);e.on("click",function(b){if(d.href&&0===d.href.indexOf("#")){var c=document.getElementById(d.href.substring(1));if(c){b.stopPropagation&&b.stopPropagation(),b.preventDefault&&b.preventDefault();var e=c.getBoundingClientRect();e.top,a.scrollDelta(0,e.top,1e3)}}})}}}]); +angular.module("duScroll",["duScroll.scroller","duScroll.scrollPosition","duScroll.requestAnimation","duScroll.smoothScroll"]),angular.module("duScroll.requestAnimation",[]).factory("requestAnimation",["$window","$timeout",function(a,b){return a.requestAnimationFrame||a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame||a.msRequestAnimationFrame||function(a){b(a,1e3/60)}}]),angular.module("duScroll.scrollPosition",["duScroll.requestAnimation"]).factory("scrollPosition",["$window","requestAnimation",function(a,b){var c=[],d=0,e=0,f=function(){e=d;for(var a=0;ai&&b(k)};k()}function e(b,c,e){d(a.scrollX+(b||0),a.scrollY+(c||0),e)}return{scrollTo:d,scrollDelta:e}}]),angular.module("duScroll.smoothScroll",["duScroll.scroller"]).directive("smoothScroll",["scroller",function(a){return{link:function(b,c,d){var e=angular.element(c[0]);e.on("click",function(b){if(d.href&&0===d.href.indexOf("#")){var c=document.getElementById(d.href.substring(1));if(c){b.stopPropagation&&b.stopPropagation(),b.preventDefault&&b.preventDefault();var e=c.getBoundingClientRect();e.top,a.scrollDelta(0,e.top,1e3)}}})}}}]); //# sourceMappingURL=angular-scroll.min.js.map \ No newline at end of file diff --git a/angular-scroll.min.js.map b/angular-scroll.min.js.map index c9192f8..37ce832 100644 --- a/angular-scroll.min.js.map +++ b/angular-scroll.min.js.map @@ -1 +1 @@ -{"version":3,"file":"angular-scroll.min.js","sources":["angular-scroll.min.js"],"names":["angular","module","factory","$window","$timeout","requestAnimationFrame","webkitRequestAnimationFrame","mozRequestAnimationFrame","oRequestAnimationFrame","msRequestAnimationFrame","callback","requestAnimation","listeners","lastScrollY","currentScrollY","executeCallbacks","i","length","element","on","this","scrollY","listen","cb","push","easeout","x","Math","pow","scrollTo","y","duration","start","scrollX","delta","frame","frames","animate","percent","ceil","scrollDelta","directive","scroller","link","$scope","$element","$attr","e","href","indexOf","elem","document","getElementById","substring","stopPropagation","preventDefault","pos","getBoundingClientRect","top"],"mappings":"AAAAA,QAAQC,OAAO,YACb,oBACA,0BACA,4BACA,0BAEFD,QAAQC,OAAO,gCAAiCC,QAAQ,oBACtD,UACA,WACA,SAAUC,EAASC,GACjB,MAAOD,GAAQE,uBAAyBF,EAAQG,6BAA+BH,EAAQI,0BAA4BJ,EAAQK,wBAA0BL,EAAQM,yBAA2B,SAAkBC,GACxMN,EAASM,EAAU,IAAO,QAIhCV,QAAQC,OAAO,2BAA4B,8BAA8BC,QAAQ,kBAC/E,UACA,mBACA,SAAUC,EAASQ,GACjB,GAAIC,MACAC,EAAc,EACdC,EAAiB,EACjBC,EAAmB,WACrBD,EAAiBD,CACjB,KAAK,GAAIG,GAAI,EAAGA,EAAIJ,EAAUK,OAAQD,IACpCJ,EAAUI,GAAGF,GASjB,OANAd,SAAQkB,QAAQf,GAASgB,GAAG,SAAU,WACpCN,EAAcO,KAAKC,QACfR,IAAgBC,GAClBH,EAAiBI,MAInBO,OAAQ,SAAUC,GAChBX,EAAUY,KAAKD,QAKvBvB,QAAQC,OAAO,qBAAsB,8BAA8BC,QAAQ,YACzE,UACA,mBACA,SAAUC,EAASQ,GACjB,QAASc,GAAQC,GACf,MAAOC,MAAKC,IAAIF,EAAG,IAErB,QAASG,GAASH,EAAGI,EAAGC,GACtB,IAAKA,EAEH,MADA5B,GAAQ0B,SAASH,EAAGI,GACpB,MAEF,IAAIE,IACAF,EAAG3B,EAAQkB,QACXK,EAAGvB,EAAQ8B,SAEXC,GACAJ,EAAGA,EAAIE,EAAMF,EACbJ,EAAGA,EAAIM,EAAMN,GAEbS,EAAQ,EACRC,EAASL,EAAW,GACpBM,EAAU,WACZF,GACA,IAAIG,GAAUb,EAAQU,EAAQC,EAC9BjC,GAAQ0B,SAASG,EAAMN,EAAIC,KAAKY,KAAKL,EAAMR,EAAIY,GAAUN,EAAMF,EAAIH,KAAKY,KAAKL,EAAMJ,EAAIQ,IAC3EF,EAARD,GACFxB,EAAiB0B,GAGrBA,KAEF,QAASG,GAAYd,EAAGI,EAAGC,GACzBF,EAAS1B,EAAQ8B,SAAWP,GAAK,GAAIvB,EAAQkB,SAAWS,GAAK,GAAIC,GAEnE,OACEF,SAAUA,EACVW,YAAaA,MAInBxC,QAAQC,OAAO,yBAA0B,sBAAsBwC,UAAU,gBACvE,WACA,SAAUC,GACR,OACEC,KAAM,SAAUC,EAAQC,EAAUC,GAChC,GAAI5B,GAAUlB,QAAQkB,QAAQ2B,EAAS,GACvC3B,GAAQC,GAAG,QAAS,SAAU4B,GAC5B,GAAKD,EAAME,MAAoC,IAA5BF,EAAME,KAAKC,QAAQ,KAAtC,CAEA,GAAIC,GAAOC,SAASC,eAAeN,EAAME,KAAKK,UAAU,GACxD,IAAKH,EAAL,CAEIH,EAAEO,iBACJP,EAAEO,kBACAP,EAAEQ,gBACJR,EAAEQ,gBACJ,IAAIC,GAAMN,EAAKO,uBACHD,GAAIE,IAChBhB,EAASF,YAAY,EAAGgB,EAAIE,IAAK"} \ No newline at end of file +{"version":3,"file":"angular-scroll.min.js","sources":["angular-scroll.min.js"],"names":["angular","module","factory","$window","$timeout","requestAnimationFrame","webkitRequestAnimationFrame","mozRequestAnimationFrame","oRequestAnimationFrame","msRequestAnimationFrame","callback","requestAnimation","observers","lastScrollY","currentScrollY","executeCallbacks","i","length","element","on","this","scrollY","observe","cb","push","easeout","x","Math","pow","scrollTo","y","duration","start","scrollX","delta","frame","frames","animate","percent","ceil","scrollDelta","directive","scroller","link","$scope","$element","$attr","e","href","indexOf","elem","document","getElementById","substring","stopPropagation","preventDefault","pos","getBoundingClientRect","top"],"mappings":"AAAAA,QAAQC,OAAO,YACb,oBACA,0BACA,4BACA,0BAEFD,QAAQC,OAAO,gCAAiCC,QAAQ,oBACtD,UACA,WACA,SAAUC,EAASC,GACjB,MAAOD,GAAQE,uBAAyBF,EAAQG,6BAA+BH,EAAQI,0BAA4BJ,EAAQK,wBAA0BL,EAAQM,yBAA2B,SAAkBC,GACxMN,EAASM,EAAU,IAAO,QAIhCV,QAAQC,OAAO,2BAA4B,8BAA8BC,QAAQ,kBAC/E,UACA,mBACA,SAAUC,EAASQ,GACjB,GAAIC,MACAC,EAAc,EACdC,EAAiB,EACjBC,EAAmB,WACrBD,EAAiBD,CACjB,KAAK,GAAIG,GAAI,EAAGA,EAAIJ,EAAUK,OAAQD,IACpCJ,EAAUI,GAAGF,GASjB,OANAd,SAAQkB,QAAQf,GAASgB,GAAG,SAAU,WACpCN,EAAcO,KAAKC,QACfR,IAAgBC,GAClBH,EAAiBI,MAInBO,QAAS,SAAUC,GACjBX,EAAUY,KAAKD,QAKvBvB,QAAQC,OAAO,qBAAsB,8BAA8BC,QAAQ,YACzE,UACA,mBACA,SAAUC,EAASQ,GACjB,QAASc,GAAQC,GACf,MAAOC,MAAKC,IAAIF,EAAG,IAErB,QAASG,GAASH,EAAGI,EAAGC,GACtB,IAAKA,EAEH,MADA5B,GAAQ0B,SAASH,EAAGI,GACpB,MAEF,IAAIE,IACAF,EAAG3B,EAAQkB,QACXK,EAAGvB,EAAQ8B,SAEXC,GACAJ,EAAGA,EAAIE,EAAMF,EACbJ,EAAGA,EAAIM,EAAMN,GAEbS,EAAQ,EACRC,EAASL,EAAW,GACpBM,EAAU,WACZF,GACA,IAAIG,GAAUb,EAAQU,EAAQC,EAC9BjC,GAAQ0B,SAASG,EAAMN,EAAIC,KAAKY,KAAKL,EAAMR,EAAIY,GAAUN,EAAMF,EAAIH,KAAKY,KAAKL,EAAMJ,EAAIQ,IAC3EF,EAARD,GACFxB,EAAiB0B,GAGrBA,KAEF,QAASG,GAAYd,EAAGI,EAAGC,GACzBF,EAAS1B,EAAQ8B,SAAWP,GAAK,GAAIvB,EAAQkB,SAAWS,GAAK,GAAIC,GAEnE,OACEF,SAAUA,EACVW,YAAaA,MAInBxC,QAAQC,OAAO,yBAA0B,sBAAsBwC,UAAU,gBACvE,WACA,SAAUC,GACR,OACEC,KAAM,SAAUC,EAAQC,EAAUC,GAChC,GAAI5B,GAAUlB,QAAQkB,QAAQ2B,EAAS,GACvC3B,GAAQC,GAAG,QAAS,SAAU4B,GAC5B,GAAKD,EAAME,MAAoC,IAA5BF,EAAME,KAAKC,QAAQ,KAAtC,CAEA,GAAIC,GAAOC,SAASC,eAAeN,EAAME,KAAKK,UAAU,GACxD,IAAKH,EAAL,CAEIH,EAAEO,iBACJP,EAAEO,kBACAP,EAAEQ,gBACJR,EAAEQ,gBACJ,IAAIC,GAAMN,EAAKO,uBACHD,GAAIE,IAChBhB,EAASF,YAAY,EAAGgB,EAAIE,IAAK"} \ No newline at end of file diff --git a/src/services/scroll-position.js b/src/services/scroll-position.js index 796d5bf..16f0bec 100644 --- a/src/services/scroll-position.js +++ b/src/services/scroll-position.js @@ -1,14 +1,14 @@ angular.module('duScroll.scrollPosition', ['duScroll.requestAnimation']). factory('scrollPosition', function($window, requestAnimation) { - var listeners = []; + var observers = []; var lastScrollY = 0; var currentScrollY = 0; var executeCallbacks = function(scrollY){ currentScrollY = lastScrollY; - for(var i = 0; i < listeners.length; i++){ - listeners[i](currentScrollY); + for(var i = 0; i < observers.length; i++){ + observers[i](currentScrollY); } }; @@ -21,8 +21,8 @@ factory('scrollPosition', }); return { - listen : function(cb){ - listeners.push(cb); + observe : function(cb){ + observers.push(cb); } }; }); \ No newline at end of file