Skip to content

Relax keyframe selectors #52

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

Merged
tj merged 1 commit into from
Sep 17, 2013
Merged

Relax keyframe selectors #52

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ module.exports = function(css, options){
var pos = position();

// prop
var prop = match(/^(\*?[-\/\*\w]+)\s*/);
var prop = match(/^(\*?[-\/\*\w]+(\[[0-9a-z_-]+\])?)\s*/);
if (!prop) return;
prop = trim(prop[0]);

Expand Down Expand Up @@ -232,7 +232,7 @@ module.exports = function(css, options){
var vals = [];
var pos = position();

while (m = match(/^(from|to|\d+%|\.\d+%|\d+\.\d+%)\s*/)) {
while (m = match(/^((\d+\.\d+|\.\d+|\d+)%{0,1}|[a-z]+)\s*/)) {
vals.push(m[1]);
match(/^,\s*/);
}
Expand Down
13 changes: 13 additions & 0 deletions test/cases/keyframes.advanced.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@keyframes advanced {
top {
opacity[sqrt]: 0;
}

100 {
opacity: 0.5;
}

bottom {
opacity: 1;
}
}
122 changes: 122 additions & 0 deletions test/cases/keyframes.advanced.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
{
"type": "stylesheet",
"stylesheet": {
"rules": [
{
"type": "keyframes",
"name": "advanced",
"keyframes": [
{
"type": "keyframe",
"values": [
"top"
],
"declarations": [
{
"type": "declaration",
"property": "opacity[sqrt]",
"value": "0",
"position": {
"start": {
"line": 3,
"column": 5
},
"end": {
"line": 3,
"column": 21
}
}
}
],
"position": {
"start": {
"line": 2,
"column": 3
},
"end": {
"line": 4,
"column": 4
}
}
},
{
"type": "keyframe",
"values": [
"100"
],
"declarations": [
{
"type": "declaration",
"property": "opacity",
"value": "0.5",
"position": {
"start": {
"line": 7,
"column": 5
},
"end": {
"line": 7,
"column": 17
}
}
}
],
"position": {
"start": {
"line": 6,
"column": 3
},
"end": {
"line": 8,
"column": 4
}
}
},
{
"type": "keyframe",
"values": [
"bottom"
],
"declarations": [
{
"type": "declaration",
"property": "opacity",
"value": "1",
"position": {
"start": {
"line": 11,
"column": 5
},
"end": {
"line": 11,
"column": 15
}
}
}
],
"position": {
"start": {
"line": 10,
"column": 3
},
"end": {
"line": 12,
"column": 4
}
}
}
],
"position": {
"start": {
"line": 1,
"column": 1
},
"end": {
"line": 13,
"column": 2
}
}
}
]
}
}