From 83196688904286ff6f5648817189961859b186c8 Mon Sep 17 00:00:00 2001 From: M Alix Date: Sun, 18 May 2014 19:04:50 -0400 Subject: [PATCH] Fixing requestAnimationFrame & cancelAnimationFrame With the previous implementation, Chrome complains: "'webkitCancelAnimationFrame' is vendor-specific. Please use the standard 'cancelAnimationFrame' instead." This fixes that by reusing (copy-paste) the code from angular.js A better way would be to use ionic.requestAnimationFrame and ionic.cancelAnimationFrame everywhere, but that is more involved and risky... --- js/utils/dom.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/js/utils/dom.js b/js/utils/dom.js index 65b8d6a1cb..e7b6b095cf 100644 --- a/js/utils/dom.js +++ b/js/utils/dom.js @@ -26,14 +26,13 @@ }; })(); - var vendors = ['webkit', 'moz']; - for(var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) { - window.requestAnimationFrame = window[vendors[x]+'RequestAnimationFrame']; - window.cancelAnimationFrame = - window[vendors[x]+'CancelAnimationFrame'] || window[vendors[x]+'CancelRequestAnimationFrame']; - } - window.cancelAnimationFrame = - window[vendors[x]+'CancelAnimationFrame'] || window[vendors[x]+'CancelRequestAnimationFrame']; + var cancelAnimationFrame = window.cancelAnimationFrame || + window.webkitCancelAnimationFrame || + window.mozCancelAnimationFrame || + window.webkitCancelRequestAnimationFrame; + + window.requestAnimationFrame = window._rAF; + window.cancelAnimationFrame = cancelAnimationFrame; /** * @ngdoc utility