From 4dbec14cac0dbef4192de1d58a438dc246dab3a7 Mon Sep 17 00:00:00 2001 From: Barry Jones Date: Fri, 1 Mar 2019 16:10:11 -0800 Subject: [PATCH] CI-9414 (bug): firefox compatibility --- src/ng/browser.js | 4 ++-- src/ng/raf.js | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ng/browser.js b/src/ng/browser.js index 4bb96ee21f1f..9abe61fbab73 100644 --- a/src/ng/browser.js +++ b/src/ng/browser.js @@ -305,7 +305,7 @@ function Browser(window, document, $log, $sniffer, $$taskTrackerFactory) { taskType = taskType || taskTracker.DEFAULT_TASK_TYPE; taskTracker.incTaskCount(taskType); - timeoutId = setTimeout(function() { + timeoutId = window.setTimeout(function() { delete pendingDeferIds[timeoutId]; taskTracker.completeTask(fn, taskType); }, delay); @@ -329,7 +329,7 @@ function Browser(window, document, $log, $sniffer, $$taskTrackerFactory) { if (pendingDeferIds.hasOwnProperty(deferId)) { var taskType = pendingDeferIds[deferId]; delete pendingDeferIds[deferId]; - clearTimeout(deferId); + window.clearTimeout(deferId); taskTracker.completeTask(noop, taskType); return true; } diff --git a/src/ng/raf.js b/src/ng/raf.js index ed0676631116..a96283098fd1 100644 --- a/src/ng/raf.js +++ b/src/ng/raf.js @@ -3,19 +3,19 @@ /** @this */ function $$RAFProvider() { //rAF this.$get = ['$window', '$timeout', function($window, $timeout) { - var requestAnimationFrame = $window.requestAnimationFrame || + var windowRequestAnimationFrame = $window.requestAnimationFrame || $window.webkitRequestAnimationFrame; - var cancelAnimationFrame = $window.cancelAnimationFrame || + var windowCancelAnimationFrame = $window.cancelAnimationFrame || $window.webkitCancelAnimationFrame || $window.webkitCancelRequestAnimationFrame; - var rafSupported = !!requestAnimationFrame; + var rafSupported = !!windowRequestAnimationFrame; var raf = rafSupported ? function(fn) { - var id = requestAnimationFrame(fn); + var id = windowRequestAnimationFrame(fn); return function() { - cancelAnimationFrame(id); + windowCancelAnimationFrame(id); }; } : function(fn) {