diff options
| author | Matias Niemelä | 2014-02-24 18:14:29 -0500 |
|---|---|---|
| committer | Matias Niemelä | 2014-02-24 21:23:05 -0500 |
| commit | 04d7317cdd95ba00783389f89f6e9a7e1fc418f8 (patch) | |
| tree | c0eff0f1d143a3340c40b532a3ffd4149787d0a0 /src | |
| parent | 2cd87dbb93497e38ffad016c1f5766c2bb56e604 (diff) | |
| download | angular.js-04d7317cdd95ba00783389f89f6e9a7e1fc418f8.tar.bz2 | |
chore(core): introduce a wrapper for requestAnimationFrame
Diffstat (limited to 'src')
| -rw-r--r-- | src/AngularPublic.js | 5 | ||||
| -rw-r--r-- | src/ng/raf.js | 22 | ||||
| -rw-r--r-- | src/ngMock/angular-mocks.js | 29 |
3 files changed, 55 insertions, 1 deletions
diff --git a/src/AngularPublic.js b/src/AngularPublic.js index 006de9ab..3870c519 100644 --- a/src/AngularPublic.js +++ b/src/AngularPublic.js @@ -72,6 +72,8 @@ $SnifferProvider, $TemplateCacheProvider, $TimeoutProvider, + $$RAFProvider, + $AsyncCallbackProvider, $WindowProvider */ @@ -211,7 +213,8 @@ function publishExternalAPI(angular){ $sniffer: $SnifferProvider, $templateCache: $TemplateCacheProvider, $timeout: $TimeoutProvider, - $window: $WindowProvider + $window: $WindowProvider, + $$rAF: $$RAFProvider }); } ]); diff --git a/src/ng/raf.js b/src/ng/raf.js new file mode 100644 index 00000000..f85ee12a --- /dev/null +++ b/src/ng/raf.js @@ -0,0 +1,22 @@ +'use strict'; + +function $$RAFProvider(){ //rAF + this.$get = ['$window', function($window) { + var requestAnimationFrame = $window.requestAnimationFrame || + $window.webkitRequestAnimationFrame; + + var cancelAnimationFrame = $window.cancelAnimationFrame || + $window.webkitCancelAnimationFrame; + + var raf = function(fn) { + var id = requestAnimationFrame(fn); + return function() { + cancelAnimationFrame(id); + }; + }; + + raf.supported = !!requestAnimationFrame; + + return raf; + }]; +} diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js index 9a45939c..efde0f3a 100644 --- a/src/ngMock/angular-mocks.js +++ b/src/ngMock/angular-mocks.js @@ -1656,6 +1656,34 @@ angular.mock.$TimeoutDecorator = function($delegate, $browser) { return $delegate; }; +angular.mock.$RAFDecorator = function($delegate) { + var queue = []; + var rafFn = function(fn) { + var index = queue.length; + queue.push(fn); + return function() { + queue.splice(index, 1); + }; + }; + + rafFn.supported = $delegate.supported; + + rafFn.flush = function() { + if(queue.length === 0) { + throw new Error('No rAF callbacks present'); + } + + var length = queue.length; + for(var i=0;i<length;i++) { + queue[i](); + } + + queue = []; + }; + + return rafFn; +}; + /** * */ @@ -1689,6 +1717,7 @@ angular.module('ngMock', ['ng']).provider({ $rootElement: angular.mock.$RootElementProvider }).config(['$provide', function($provide) { $provide.decorator('$timeout', angular.mock.$TimeoutDecorator); + $provide.decorator('$$rAF', angular.mock.$RAFDecorator); }]); /** |
