Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix paper-progress-circular infinite loop in acceptance tests #811

Merged
merged 1 commit into from
Oct 11, 2017
Merged

Fix paper-progress-circular infinite loop in acceptance tests #811

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
64 changes: 33 additions & 31 deletions addon/components/paper-progress-circular.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,39 +155,41 @@ export default Component.extend(ColorMixin, {

lastAnimationId: 0,
renderCircle(animateFrom, animateTo, ease = linearEase, animationDuration = 100, iterationCount = 0, dashLimit = 100) {
let id = ++this.lastAnimationId;
let startTime = now();
let changeInValue = animateTo - animateFrom;
let diameter = this.get('diameter');
let strokeWidth = this.get('strokeWidth');
let rotation = -90 * iterationCount;

let renderFrame = (value, diameter, strokeWidth, dashLimit) => {
if (!this.isDestroyed && !this.isDestroying) {
this.$('path').attr('stroke-dashoffset', this.getDashLength(diameter, strokeWidth, value, dashLimit));
this.$('path').attr('transform', `rotate(${rotation} ${diameter / 2} ${diameter / 2})`);
}
};

// No need to animate it if the values are the same
if (animateTo === animateFrom) {
renderFrame(animateTo, diameter, strokeWidth, dashLimit);
} else {
let animation = () => {
let currentTime = clamp(now() - startTime, 0, animationDuration);

renderFrame(ease(currentTime, animateFrom, changeInValue, animationDuration), diameter, strokeWidth, dashLimit);

// Do not allow overlapping animations
if (id === this.lastAnimationId && currentTime < animationDuration) {
this.lastDrawFrame = rAF(animation);
}

if (currentTime >= animationDuration && this.get('mode') === MODE_INDETERMINATE) {
this.startIndeterminateAnimation();
if (!this.isDestroyed && !this.isDestroying) {
let id = ++this.lastAnimationId;
let startTime = now();
let changeInValue = animateTo - animateFrom;
let diameter = this.get('diameter');
let strokeWidth = this.get('strokeWidth');
let rotation = -90 * iterationCount;

let renderFrame = (value, diameter, strokeWidth, dashLimit) => {
if (!this.isDestroyed && !this.isDestroying) {
this.$('path').attr('stroke-dashoffset', this.getDashLength(diameter, strokeWidth, value, dashLimit));
this.$('path').attr('transform', `rotate(${rotation} ${diameter / 2} ${diameter / 2})`);
}
};
this.lastDrawFrame = rAF(animation);

// No need to animate it if the values are the same
if (animateTo === animateFrom) {
renderFrame(animateTo, diameter, strokeWidth, dashLimit);
} else {
let animation = () => {
let currentTime = clamp(now() - startTime, 0, animationDuration);

renderFrame(ease(currentTime, animateFrom, changeInValue, animationDuration), diameter, strokeWidth, dashLimit);

// Do not allow overlapping animations
if (id === this.lastAnimationId && currentTime < animationDuration) {
this.lastDrawFrame = rAF(animation);
}

if (currentTime >= animationDuration && this.get('mode') === MODE_INDETERMINATE) {
this.startIndeterminateAnimation();
}
};
this.lastDrawFrame = rAF(animation);
}
}
},

Expand Down