Skip to content

Commit 5de9396

Browse files
committed
Merge pull request #62 from nschonni/add-border-inherit-gh-61
Support inherit for border-radius short and long hand
2 parents 3ddd74b + 30dea0e commit 5de9396

3 files changed

Lines changed: 9 additions & 10 deletions

File tree

src/css/Properties.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,15 @@ var Properties = {
152152
"border-radius" : function(expression) {
153153

154154
var valid = false,
155-
numeric = "<length> | <percentage>",
155+
simple = "<length> | <percentage> | inherit",
156156
slash = false,
157157
fill = false,
158158
count = 0,
159159
max = 8,
160160
part;
161161

162162
while (expression.hasNext() && count < max) {
163-
valid = ValidationTypes.isAny(expression, numeric);
163+
valid = ValidationTypes.isAny(expression, simple);
164164
if (!valid) {
165165

166166
if (expression.peek() == "/" && count > 0 && !slash) {

src/css/ValidationTypes.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -344,14 +344,11 @@ var ValidationTypes = {
344344
"<x-one-radius>": function(expression) {
345345
//[ <length> | <percentage> ] [ <length> | <percentage> ]?
346346
var result = false,
347-
count = 0,
348-
numeric = "<length> | <percentage>",
349-
part;
347+
simple = "<length> | <percentage> | inherit";
350348

351-
if (ValidationTypes.isAny(expression, numeric)){
349+
if (ValidationTypes.isAny(expression, simple)){
352350
result = true;
353-
354-
ValidationTypes.isAny(expression, numeric);
351+
ValidationTypes.isAny(expression, simple);
355352
}
356353

357354
return result;

tests/css/Validation.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,8 @@
282282
valid: [
283283
"5px",
284284
"25%",
285-
"5px 25%"
285+
"5px 25%",
286+
"inherit"
286287
],
287288

288289
invalid: {
@@ -318,7 +319,8 @@
318319
"5px 25%",
319320
"5px / 25%",
320321
"5px 25% / 7px 27%",
321-
"1px 2px 3px 4px / 5px 6px 7px 8px"
322+
"1px 2px 3px 4px / 5px 6px 7px 8px",
323+
"inherit"
322324
],
323325

324326
invalid: {

0 commit comments

Comments
 (0)