Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Detect keyword 'linear' on lines containing word 'animation' too #10989

Merged
merged 3 commits into from
Jun 20, 2015

Conversation

petetnt
Copy link
Collaborator

@petetnt petetnt commented Apr 23, 2015

Fixes #10984

@@ -42,7 +42,7 @@ define(function (require, exports, module) {
BEZIER_CURVE_GENERAL_REGEX = /cubic-bezier\((.*)\)/,
EASE_STRICT_REGEX = /[: ,]ease(?:-in)?(?:-out)?[ ,;]/,
EASE_LAX_REGEX = /ease(?:-in)?(?:-out)?/,
LINEAR_STRICT_REGEX = /transition.*?[: ,]linear[ ,;]/,
LINEAR_STRICT_REGEX = /transition|animation.*?[: ,]linear[ ,;]/,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should actually be between parenthesis, like this: (transition|animation).*?[: ,]linear[ ,;]

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah you are correct there, don't remember what I was thinking there!

@marcelgerber marcelgerber self-assigned this Jun 19, 2015
@marcelgerber
Copy link
Contributor

Could you also add a unit test for this?

@petetnt
Copy link
Collaborator Author

petetnt commented Jun 19, 2015

@marcelgerber for the unit tests, should these tests be just repeated with the animation keyword (the unit tests are the same, just with different word IIRC) or should the existing tests be modified to test for both the ´transition" and "animation" keywords?

@marcelgerber
Copy link
Contributor

It's probably enough to just repeat one or two unit tests with the animation keyword.

@petetnt
Copy link
Collaborator Author

petetnt commented Jun 20, 2015

Added the unit tests

@marcelgerber
Copy link
Contributor

Thanks!
Merging.

marcelgerber added a commit that referenced this pull request Jun 20, 2015
Detect keyword 'linear' on lines containing word 'animation' too
@marcelgerber marcelgerber merged commit 7159b14 into adobe:master Jun 20, 2015
@petetnt petetnt deleted the linear-keyword-detection-fix branch June 20, 2015 13:52
@petetnt
Copy link
Collaborator Author

petetnt commented Jun 20, 2015

👍 awesome

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CSS Timing Function Quick Edit: linear is invalid syntax
2 participants