fix($$RAFProvider): check for webkitCancelRequestAnimationFrame.

Android 4.3 only supports webkitCancelRequestAnimationFrame. Closes angular#6526
Traxmaxx · Mar 6, 2014 · d324c9e · d324c9e · nenadvicentic · Mar 10, 2014
1 parent d07101d
commit d324c9e
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 13 deletions.
diff --git a/src/ng/raf.js b/src/ng/raf.js
@@ -1,22 +1,27 @@
 'use strict';
 
-function $$RAFProvider(){ //rAF
-  this.$get = ['$window', function($window) {
-    var requestAnimationFrame = $window.requestAnimationFrame ||
-                                $window.webkitRequestAnimationFrame;
+function createRAF($window) {
+  var requestAnimationFrame = $window.requestAnimationFrame ||
+                              $window.webkitRequestAnimationFrame;
 
-    var cancelAnimationFrame = $window.cancelAnimationFrame ||
-                               $window.webkitCancelAnimationFrame;
+  var cancelAnimationFrame = $window.cancelAnimationFrame ||
+                             $window.webkitCancelAnimationFrame ||
+                             $window.webkitCancelRequestAnimationFrame;
 
-    var raf = function(fn) {
-      var id = requestAnimationFrame(fn);
-      return function() {
-        cancelAnimationFrame(id);
-      };
+  var raf = function(fn) {
+    var id = requestAnimationFrame(fn);
+    return function() {
+      cancelAnimationFrame(id);
     };
+  };
+
+  raf.supported = !!requestAnimationFrame;
 
-    raf.supported = !!requestAnimationFrame;
+  return raf;
+}
 
-    return raf;
+function $$RAFProvider(){ //rAF
+  this.$get = ['$window', function($window) {
+    return createRAF($window);
   }];
 }
diff --git a/test/ng/rafSpec.js b/test/ng/rafSpec.js
@@ -44,4 +44,28 @@ describe('$$rAF', function() {
       }
     }));
   });
+
+  describe('mobile', function() {
+    var $window;
+
+    it('should provide a cancellation method for an older version of Android', function() {
+      module(function($provide) {
+        $provide.value('$window', {
+          webkitRequestAnimationFrame: jasmine.createSpy('$window.webkitRequestAnimationFrame'),
+          webkitCancelRequestAnimationFrame: jasmine.createSpy('$window.webkitCancelRequestAnimationFrame')
+        });
+      });
+
+      inject(function($window) {
+        var $raf = createRAF($window);
+        var cancel = $raf(function() {});
+
+        try {
+          cancel();
+        } catch(e) {}
+
+        expect($window.webkitCancelRequestAnimationFrame).toHaveBeenCalled();
+      });
+    });
+  });
 });