Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

fix(progressCircular): better support for older ios versions #9254

Merged
merged 1 commit into from
Aug 23, 2016
Merged

fix(progressCircular): better support for older ios versions #9254

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/components/progressCircular/js/progressCircularDirective.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,15 @@ function MdProgressCircularDirective($window, $mdProgressCircular, $mdTheming,

// Note that this shouldn't use use $$rAF, because it can cause an infinite loop
// in any tests that call $animate.flush.
var rAF = $window.requestAnimationFrame || angular.noop;
var cAF = $window.cancelAnimationFrame || angular.noop;
var rAF = $window.requestAnimationFrame ||
$window.webkitRequestAnimationFrame ||
angular.noop;

var cAF = $window.cancelAnimationFrame ||
$window.webkitCancelAnimationFrame ||
$window.webkitCancelRequestAnimationFrame ||
angular.noop;

var DEGREE_IN_RADIANS = $window.Math.PI / 180;
var MODE_DETERMINATE = 'determinate';
var MODE_INDETERMINATE = 'indeterminate';
Expand Down Expand Up @@ -208,8 +215,8 @@ function MdProgressCircularDirective($window, $mdProgressCircular, $mdTheming,
if (animateTo === animateFrom) {
path.attr('d', getSvgArc(animateTo, diameter, pathDiameter, rotation));
} else {
lastDrawFrame = rAF(function animation(now) {
var currentTime = $window.Math.max(0, $window.Math.min((now || $mdUtil.now()) - startTime, animationDuration));
lastDrawFrame = rAF(function animation() {
var currentTime = $window.Math.max(0, $window.Math.min($mdUtil.now() - startTime, animationDuration));

path.attr('d', getSvgArc(
ease(currentTime, animateFrom, changeInValue, animationDuration),
Expand Down