Skip to content

Fix validation of background-position #33

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
nzakas merged 1 commit into from
Oct 8, 2012
Merged

Fix validation of background-position #33

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
80 changes: 47 additions & 33 deletions src/css/ValidationTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var ValidationTypes = {
},

/**
* Determines if the next part(s) of the given expresion
* Determines if the next part(s) of the given expression
* are one of a group.
*/
isAnyOfGroup: function(expression, types) {
Expand Down Expand Up @@ -187,10 +187,16 @@ var ValidationTypes = {
var types = this,
result = false,
numeric = "<percentage> | <length>",
xDir = "left | center | right",
yDir = "top | center | bottom",
part,
i, len;
xDir = "left | right",
yDir = "top | bottom",
count = 0,
hasNext = function() {
return expression.hasNext() && expression.peek() != ",";
};

while (expression.peek(count) && expression.peek(count) != ",") {
count++;
}

/*
<position> = [
Expand All @@ -202,40 +208,48 @@ var ValidationTypes = {
[ center | [ left | right ] [ <percentage> | <length> ]? ] &&
[ center | [ top | bottom ] [ <percentage> | <length> ]? ]
]
*/

*/

if (ValidationTypes.isAny(expression, "top | bottom")) {
result = true;
if (count < 3) {
if (ValidationTypes.isAny(expression, xDir + " | center | " + numeric)) {
result = true;
ValidationTypes.isAny(expression, yDir + " | center | " + numeric);
} else if (ValidationTypes.isAny(expression, yDir)) {
result = true;
ValidationTypes.isAny(expression, xDir + " | center");
}
} else {

//must be two-part
if (ValidationTypes.isAny(expression, numeric)){
if (expression.hasNext()){
result = ValidationTypes.isAny(expression, numeric + " | " + yDir);
}
} else if (ValidationTypes.isAny(expression, xDir)){
if (expression.hasNext()){

//two- or three-part
if (ValidationTypes.isAny(expression, yDir)){
if (ValidationTypes.isAny(expression, xDir)) {
if (ValidationTypes.isAny(expression, yDir)) {
result = true;
ValidationTypes.isAny(expression, numeric);
} else if (ValidationTypes.isAny(expression, numeric)) {
if (ValidationTypes.isAny(expression, yDir)) {
result = true;

ValidationTypes.isAny(expression, numeric);

} else if (ValidationTypes.isAny(expression, numeric)){

//could also be two-part, so check the next part
if (ValidationTypes.isAny(expression, yDir)){
ValidationTypes.isAny(expression, numeric);
}

} else if (ValidationTypes.isAny(expression, "center")) {
result = true;
}
}
}
}

} else if (ValidationTypes.isAny(expression, yDir)) {
if (ValidationTypes.isAny(expression, xDir)) {
result = true;
ValidationTypes.isAny(expression, numeric);
} else if (ValidationTypes.isAny(expression, numeric)) {
if (ValidationTypes.isAny(expression, xDir)) {
result = true;
ValidationTypes.isAny(expression, numeric);
} else if (ValidationTypes.isAny(expression, "center")) {
result = true;
}
}
} else if (ValidationTypes.isAny(expression, "center")) {
if (ValidationTypes.isAny(expression, xDir + " | " + yDir)) {
result = true;
ValidationTypes.isAny(expression, numeric);
}
}
}

return result;
},
Expand Down Expand Up @@ -339,4 +353,4 @@ var ValidationTypes = {
return result;
}
}
};
};
15 changes: 10 additions & 5 deletions tests/css/Validation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,23 +153,28 @@
"top",
"bottom",
"center",
"100%",
"left center",
"bottom left",
"left 10px",
"center bottom",
"10% top",
"left 10px bottom",
"right top 5%",
"center 3em center 10%",
"top 3em center",
"center top 3em",
"top 3em right 10%",
"top, bottom",
"left 10px, left 10px",
"right top 5%, left 10px bottom"
],

invalid: {
"foo" : "Expected (<bg-position>) but found 'foo'.",
"left center right" : "Expected end of value but found 'right'."

}
"foo" : "Expected (<bg-position>) but found 'foo'.",
"10% left" : "Expected end of value but found 'left'.",
"left center right" : "Expected end of value but found 'center'.",
"center 3em right 10%": "Expected end of value but found '3em'.",
}
}));

suite.add(new ValidationTestCase({
Expand Down