Skip to content

Commit a59bee7

Browse files
committed
Merge pull request #68 from TooooBug/master
add '-webkit-box' and '-webkit-inline-box' of 'dislay'
2 parents 46dddd5 + 8b01682 commit a59bee7

File tree

2 files changed

+52
-2
lines changed

2 files changed

+52
-2
lines changed

src/css/Properties.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ var Properties = {
251251

252252
//D
253253
"direction" : "ltr | rtl | inherit",
254-
"display" : "inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | box | inline-box | grid | inline-grid | none | inherit | -moz-box | -moz-inline-block | -moz-inline-box | -moz-inline-grid | -moz-inline-stack | -moz-inline-table | -moz-grid | -moz-grid-group | -moz-grid-line | -moz-groupbox | -moz-deck | -moz-popup | -moz-stack | -moz-marker",
254+
"display" : "inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | box | inline-box | grid | inline-grid | none | inherit | -moz-box | -moz-inline-block | -moz-inline-box | -moz-inline-grid | -moz-inline-stack | -moz-inline-table | -moz-grid | -moz-grid-group | -moz-grid-line | -moz-groupbox | -moz-deck | -moz-popup | -moz-stack | -moz-marker | -webkit-box | -webkit-inline-box",
255255
"dominant-baseline" : 1,
256256
"drop-initial-after-adjust" : "central | middle | after-edge | text-after-edge | ideographic | alphabetic | mathematical | <percentage> | <length>",
257257
"drop-initial-after-align" : "baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",
@@ -478,4 +478,4 @@ var Properties = {
478478
//Z
479479
"z-index" : "<integer> | auto | inherit",
480480
"zoom" : "<number> | <percentage> | normal"
481-
};
481+
};

tests/css/Validation.js

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,56 @@
488488
}
489489
}));
490490

491+
suite.add(new ValidationTestCase({
492+
property: "display",
493+
494+
valid: [
495+
"inline",
496+
"block",
497+
"list-item",
498+
"inline-block",
499+
"table",
500+
"inline-table",
501+
"table-row-group",
502+
"table-header-group",
503+
"table-footer-group",
504+
"table-row",
505+
"table-column-group",
506+
"table-column",
507+
"table-cell",
508+
"table-caption",
509+
"box",
510+
"inline-box",
511+
"grid",
512+
"inline-grid",
513+
"none",
514+
"inherit",
515+
"-moz-box",
516+
"-moz-inline-block",
517+
"-moz-inline-box",
518+
"-moz-inline-grid",
519+
"-moz-inline-stack",
520+
"-moz-inline-table",
521+
"-moz-grid",
522+
"-moz-grid-group",
523+
"-moz-grid-line",
524+
"-moz-groupbox",
525+
"-moz-deck",
526+
"-moz-popup",
527+
"-moz-stack",
528+
"-moz-marker",
529+
"-webkit-box",
530+
"-webkit-inline-box"
531+
532+
],
533+
534+
invalid: {
535+
"foo" : " Expected (inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | box | inline-box | grid | inline-grid | none | inherit | -moz-box | -moz-inline-block | -moz-inline-box | -moz-inline-grid | -moz-inline-stack | -moz-inline-table | -moz-grid | -moz-grid-group | -moz-grid-line | -moz-groupbox | -moz-deck | -moz-popup | -moz-stack | -moz-marker | -webkit-box | -webkit-inine-box) but found '-webkit-box'."
536+
}
537+
}));
538+
539+
540+
491541
suite.add(new ValidationTestCase({
492542
property: "min-height",
493543

0 commit comments

Comments
 (0)