| OLD | NEW |
| 1 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> | 1 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> |
| 2 <html> | 2 <html> |
| 3 <head> | 3 <head> |
| 4 <link href="resources/grid.css" rel="stylesheet"> | 4 <link href="resources/grid.css" rel="stylesheet"> |
| 5 <style> | 5 <style> |
| 6 #gridTemplateWithNone { | 6 #gridTemplateWithNone { |
| 7 grid-template: none; | 7 grid-template: none; |
| 8 } | 8 } |
| 9 #gridTemplateSimpleForm { | 9 #gridTemplateSimpleForm { |
| 10 grid-template: 10px / 15px; | 10 grid-template: 10px / 15px; |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 grid-template: (first) 10px repeat(2, (nav nav2) 15px) / "a b c" 100px
(nav) | 35 grid-template: (first) 10px repeat(2, (nav nav2) 15px) / "a b c" 100px
(nav) |
| 36 (nav2) "d e f" 25px
(nav) | 36 (nav2) "d e f" 25px
(nav) |
| 37 (nav2) "g h i" 25px
(last); | 37 (nav2) "g h i" 25px
(last); |
| 38 } | 38 } |
| 39 #gridTemplateComplexFormWithAuto { | 39 #gridTemplateComplexFormWithAuto { |
| 40 grid-template: 10px / "a"; | 40 grid-template: 10px / "a"; |
| 41 } | 41 } |
| 42 #gridTemplateComplexFormOnlyAreas { | 42 #gridTemplateComplexFormOnlyAreas { |
| 43 grid-template: "a"; | 43 grid-template: "a"; |
| 44 } | 44 } |
| 45 #gridTemplateNoColumnsRowWithEmptyTrailingLineNames { |
| 46 grid-template: (first) "a" auto (); |
| 47 } |
| 45 | 48 |
| 46 /* Bad values. */ | 49 /* Bad values. */ |
| 47 | 50 |
| 48 #gridTemplateMultipleSlash { | 51 #gridTemplateMultipleSlash { |
| 49 grid-template: 10px / 20px / 30px; | 52 grid-template: 10px / 20px / 30px; |
| 50 } | 53 } |
| 51 #gridTemplateSimpleFormJustColumns { | 54 #gridTemplateSimpleFormJustColumns { |
| 52 grid-template: 10px; | 55 grid-template: 10px; |
| 53 } | 56 } |
| 54 #gridTemplateSimpleFormNoRows { | 57 #gridTemplateSimpleFormNoRows { |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 } | 101 } |
| 99 #gridTemplateComplexFormColumnsNotParsing1 { | 102 #gridTemplateComplexFormColumnsNotParsing1 { |
| 100 grid-template: a / "a" (name) 10px; | 103 grid-template: a / "a" (name) 10px; |
| 101 } | 104 } |
| 102 #gridTemplateComplexFormColumnsNotParsing2 { | 105 #gridTemplateComplexFormColumnsNotParsing2 { |
| 103 grid-template: "B" / "a" (name) 10px; | 106 grid-template: "B" / "a" (name) 10px; |
| 104 } | 107 } |
| 105 #gridTemplateComplexFormWithNoneColumns { | 108 #gridTemplateComplexFormWithNoneColumns { |
| 106 grid-template: none / "a" (name) 10px; | 109 grid-template: none / "a" (name) 10px; |
| 107 } | 110 } |
| 111 #gridTemplateNoColumnsRowWithTwoEmptyTrailingLineNames { |
| 112 grid-template: (first) "a" auto () (); |
| 113 } |
| 114 #gridTemplateNoColumnsRowWithEmptyTrailingLineNamesAndNonEmptyLeadingLineNames { |
| 115 grid-template: (first) "a" auto () (tail); |
| 116 } |
| 108 | 117 |
| 109 </style> | 118 </style> |
| 110 <script src="../../resources/js-test.js"></script> | 119 <script src="../../resources/js-test.js"></script> |
| 111 </head> | 120 </head> |
| 112 <body> | 121 <body> |
| 113 <div class="grid" id="gridTemplateWithNone"></div> | 122 <div class="grid" id="gridTemplateWithNone"></div> |
| 114 <div class="grid" id="gridTemplateSimpleForm"></div> | 123 <div class="grid" id="gridTemplateSimpleForm"></div> |
| 115 <div class="grid" id="gridTemplateSimpleFormWithNoneColumns"></div> | 124 <div class="grid" id="gridTemplateSimpleFormWithNoneColumns"></div> |
| 116 <div class="grid" id="gridTemplateSimpleFormWithNoneRows"></div> | 125 <div class="grid" id="gridTemplateSimpleFormWithNoneRows"></div> |
| 117 <div class="grid" id="gridTemplateSimpleFormWithNone"></div> | 126 <div class="grid" id="gridTemplateSimpleFormWithNone"></div> |
| 118 <div class="grid" id="gridTemplateComplexForm"></div> | 127 <div class="grid" id="gridTemplateComplexForm"></div> |
| 119 <div class="grid" id="gridTemplateComplexFormWithLineNames"></div> | 128 <div class="grid" id="gridTemplateComplexFormWithLineNames"></div> |
| 120 <div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleColumns"></div
> | 129 <div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleColumns"></div
> |
| 121 <div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleRows"></div> | 130 <div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleRows"></div> |
| 122 <div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns
"></div> | 131 <div class="grid" id="gridTemplateComplexFormWithLineNamesMultipleRowsAndColumns
"></div> |
| 123 <div class="grid" id="gridTemplateComplexFormWithAuto"></div> | 132 <div class="grid" id="gridTemplateComplexFormWithAuto"></div> |
| 124 <div class="grid" id="gridTemplateComplexFormOnlyAreas"></div> | 133 <div class="grid" id="gridTemplateComplexFormOnlyAreas"></div> |
| 134 <div class="grid" id="gridTemplateNoColumnsRowWithEmptyTrailingLineNames"></div> |
| 135 <div class="grid" id="gridTemplateNoColumnsRowWithEmptyTrailingLineNamesAndNonEm
ptyLeadingLineNames"></div> |
| 136 <div class="grid" id="gridTemplateNoColumnsRowWithNonEmptyLeadingLineNamesAndEmp
tyTrailingLineNames"></div> |
| 125 <div class="grid" id="gridTemplateMultipleSlash"></div> | 137 <div class="grid" id="gridTemplateMultipleSlash"></div> |
| 126 <div class="grid" id="gridTemplateSimpleFormJustColumns"></div> | 138 <div class="grid" id="gridTemplateSimpleFormJustColumns"></div> |
| 127 <div class="grid" id="gridTemplateSimpleFormNoRows"></div> | 139 <div class="grid" id="gridTemplateSimpleFormNoRows"></div> |
| 128 <div class="grid" id="gridTemplateSimpleFormNoColumns"></div> | 140 <div class="grid" id="gridTemplateSimpleFormNoColumns"></div> |
| 129 <div class="grid" id="gridTemplateSimpleFormNoColumnSize"></div> | 141 <div class="grid" id="gridTemplateSimpleFormNoColumnSize"></div> |
| 130 <div class="grid" id="gridTemplateSimpleFormWithFitContent"></div> | 142 <div class="grid" id="gridTemplateSimpleFormWithFitContent"></div> |
| 131 <div class="grid" id="gridTemplateSimpleFormWithWrongRepeat"></div> | 143 <div class="grid" id="gridTemplateSimpleFormWithWrongRepeat"></div> |
| 132 <div class="grid" id="gridTemplateSimpleFormWithMisplacedNone1"></div> | 144 <div class="grid" id="gridTemplateSimpleFormWithMisplacedNone1"></div> |
| 133 <div class="grid" id="gridTemplateSimpleFormWithMisplacedNone2"></div> | 145 <div class="grid" id="gridTemplateSimpleFormWithMisplacedNone2"></div> |
| 134 <div class="grid" id="gridTemplateSimpleFormWithMisplacedNone3"></div> | 146 <div class="grid" id="gridTemplateSimpleFormWithMisplacedNone3"></div> |
| 135 <div class="grid" id="gridTemplateSimpleFormWithMisplacedNone4"></div> | 147 <div class="grid" id="gridTemplateSimpleFormWithMisplacedNone4"></div> |
| 136 <div class="grid" id="gridTemplateComplexFormWithRepeat"></div> | 148 <div class="grid" id="gridTemplateComplexFormWithRepeat"></div> |
| 137 <div class="grid" id="gridTemplateComplexFormWithWrongRepeat"></div> | 149 <div class="grid" id="gridTemplateComplexFormWithWrongRepeat"></div> |
| 138 <div class="grid" id="griTemplateComplexFormdWithFitAvailable"></div> | 150 <div class="grid" id="griTemplateComplexFormdWithFitAvailable"></div> |
| 139 <div class="grid" id="gridTemplateComplexFormNoColumnSize"></div> | 151 <div class="grid" id="gridTemplateComplexFormNoColumnSize"></div> |
| 140 <div class="grid" id="gridTemplateComplexFormMisplacedRowsSize1"></div> | 152 <div class="grid" id="gridTemplateComplexFormMisplacedRowsSize1"></div> |
| 141 <div class="grid" id="gridTemplateComplexFormMisplacedRowsSize2"></div> | 153 <div class="grid" id="gridTemplateComplexFormMisplacedRowsSize2"></div> |
| 142 <div class="grid" id="gridTemplateComplexFormColumnsNotParsing1"></div> | 154 <div class="grid" id="gridTemplateComplexFormColumnsNotParsing1"></div> |
| 143 <div class="grid" id="gridTemplateComplexFormColumnsNotParsing2"></div> | 155 <div class="grid" id="gridTemplateComplexFormColumnsNotParsing2"></div> |
| 144 <div class="grid" id="gridTemplateComplexFormWithNoneColumns"></div> | 156 <div class="grid" id="gridTemplateComplexFormWithNoneColumns"></div> |
| 157 <div class="grid" id="gridTemplateNoColumnsRowWithTwoEmptyTrailingLineNames"></d
iv> |
| 145 <script src="resources/grid-template-shorthand-parsing-utils.js"></script> | 158 <script src="resources/grid-template-shorthand-parsing-utils.js"></script> |
| 146 <script> | 159 <script> |
| 147 description("This test checks that the 'grid-template' shorthand is properly
parsed and the longhand properties correctly assigned."); | 160 description("This test checks that the 'grid-template' shorthand is properly
parsed and the longhand properties correctly assigned."); |
| 148 | 161 |
| 149 debug("Test getting grid-template-areas set through CSS."); | 162 debug("Test getting grid-template-areas set through CSS."); |
| 150 testGridDefinitionsValues(document.getElementById("gridTemplateWithNone"), "
none", "none", "none"); | 163 testGridDefinitionsValues(document.getElementById("gridTemplateWithNone"), "
none", "none", "none"); |
| 151 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleForm"),
"10px", "15px", "none"); | 164 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleForm"),
"10px", "15px", "none"); |
| 152 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hNoneColumns"), "none", "15px", "none"); | 165 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hNoneColumns"), "none", "15px", "none"); |
| 153 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hNoneRows"), "10px", "none", "none"); | 166 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hNoneRows"), "10px", "none", "none"); |
| 154 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hNone"), "none", "none", "none"); | 167 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hNone"), "none", "none", "none"); |
| 155 testGridDefinitionsValues(document.getElementById("gridTemplateComplexForm")
, "10px", "15px", '"a"'); | 168 testGridDefinitionsValues(document.getElementById("gridTemplateComplexForm")
, "10px", "15px", '"a"'); |
| 156 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWi
thLineNames"), "10px", "(head) 15px (tail)", '"a"'); | 169 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWi
thLineNames"), "10px", "(head) 15px (tail)", '"a"'); |
| 157 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWi
thLineNamesMultipleColumns"), "10px", "(head) 15px (tail)", '"a b"'); | 170 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWi
thLineNamesMultipleColumns"), "10px", "(head) 15px (tail)", '"a b"'); |
| 158 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWi
thLineNamesMultipleRows"), "10px", "(head1) 15px (tail1 head2) 20px (tail2)", '"
a" "b"'); | 171 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWi
thLineNamesMultipleRows"), "10px", "(head1) 15px (tail1 head2) 20px (tail2)", '"
a" "b"'); |
| 159 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWi
thLineNamesMultipleRowsAndColumns"), "(first) 10px (nav nav2) 15px (nav nav2) 15
px", "100px (nav nav2) 25px (nav nav2) 25px (last)", '"a b c" "d e f" "g h i"'); | 172 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWi
thLineNamesMultipleRowsAndColumns"), "(first) 10px (nav nav2) 15px (nav nav2) 15
px", "100px (nav nav2) 25px (nav nav2) 25px (last)", '"a b c" "d e f" "g h i"'); |
| 160 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWi
thAuto"), "10px", "0px", '"a"'); | 173 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWi
thAuto"), "10px", "0px", '"a"'); |
| 161 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormOn
lyAreas"), "none", "0px", '"a"'); | 174 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormOn
lyAreas"), "none", "0px", '"a"'); |
| 175 testGridDefinitionsValues(document.getElementById("gridTemplateNoColumnsRowW
ithEmptyTrailingLineNames"), "none", "(first) 0px", '"a"'); |
| 162 | 176 |
| 163 debug(""); | 177 debug(""); |
| 164 debug("Test getting wrong values for grid-template shorthand through CSS (th
ey should resolve to the default: 'none')"); | 178 debug("Test getting wrong values for grid-template shorthand through CSS (th
ey should resolve to the default: 'none')"); |
| 165 testGridDefinitionsValues(document.getElementById("gridTemplateMultipleSlash
"), "none", "none", "none"); | 179 testGridDefinitionsValues(document.getElementById("gridTemplateMultipleSlash
"), "none", "none", "none"); |
| 166 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormJus
tColumns"), "none", "none", "none"); | 180 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormJus
tColumns"), "none", "none", "none"); |
| 167 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormNoR
ows"), "none", "none", "none"); | 181 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormNoR
ows"), "none", "none", "none"); |
| 168 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormNoC
olumns"), "none", "none", "none"); | 182 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormNoC
olumns"), "none", "none", "none"); |
| 169 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormNoC
olumnSize"), "none", "none", "none"); | 183 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormNoC
olumnSize"), "none", "none", "none"); |
| 170 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hFitContent"), "none", "none", "none"); | 184 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hFitContent"), "none", "none", "none"); |
| 171 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hWrongRepeat"), "none", "none", "none"); | 185 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hWrongRepeat"), "none", "none", "none"); |
| 172 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hMisplacedNone1"), "none", "none", "none"); | 186 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hMisplacedNone1"), "none", "none", "none"); |
| 173 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hMisplacedNone2"), "none", "none", "none"); | 187 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hMisplacedNone2"), "none", "none", "none"); |
| 174 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hMisplacedNone3"), "none", "none", "none"); | 188 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hMisplacedNone3"), "none", "none", "none"); |
| 175 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hMisplacedNone4"), "none", "none", "none"); | 189 testGridDefinitionsValues(document.getElementById("gridTemplateSimpleFormWit
hMisplacedNone4"), "none", "none", "none"); |
| 176 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWi
thRepeat"), "none", "none", "none"); | 190 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWi
thRepeat"), "none", "none", "none"); |
| 177 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWi
thWrongRepeat"), "none", "none", "none"); | 191 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWi
thWrongRepeat"), "none", "none", "none"); |
| 178 testGridDefinitionsValues(document.getElementById("griTemplateComplexFormdWi
thFitAvailable"), "none", "none", "none"); | 192 testGridDefinitionsValues(document.getElementById("griTemplateComplexFormdWi
thFitAvailable"), "none", "none", "none"); |
| 179 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormNo
ColumnSize"), "none", "none", "none"); | 193 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormNo
ColumnSize"), "none", "none", "none"); |
| 180 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormMi
splacedRowsSize1"), "none", "none", "none"); | 194 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormMi
splacedRowsSize1"), "none", "none", "none"); |
| 181 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormMi
splacedRowsSize2"), "none", "none", "none"); | 195 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormMi
splacedRowsSize2"), "none", "none", "none"); |
| 182 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormCo
lumnsNotParsing1"), "none", "none", "none"); | 196 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormCo
lumnsNotParsing1"), "none", "none", "none"); |
| 183 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormCo
lumnsNotParsing2"), "none", "none", "none"); | 197 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormCo
lumnsNotParsing2"), "none", "none", "none"); |
| 184 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWi
thNoneColumns"), "none", "none", "none"); | 198 testGridDefinitionsValues(document.getElementById("gridTemplateComplexFormWi
thNoneColumns"), "none", "none", "none"); |
| 199 testGridDefinitionsValues(document.getElementById("gridTemplateNoColumnsRowW
ithTwoEmptyTrailingLineNames"), "none", "none", "none"); |
| 200 testGridDefinitionsValues(document.getElementById("gridTemplateNoColumnsRowW
ithEmptyTrailingLineNamesAndNonEmptyLeadingLineNames"), "none", "none", "none"); |
| 185 | 201 |
| 186 debug(""); | 202 debug(""); |
| 187 debug("Test the initial value"); | 203 debug("Test the initial value"); |
| 188 var element = document.createElement("div"); | 204 var element = document.createElement("div"); |
| 189 document.body.appendChild(element); | 205 document.body.appendChild(element); |
| 190 testGridDefinitionsValues(element, "none", "none", "none"); | 206 testGridDefinitionsValues(element, "none", "none", "none"); |
| 191 shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-colu
mns')", "'none'"); | 207 shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-colu
mns')", "'none'"); |
| 192 shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows
')", "'none'"); | 208 shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-rows
')", "'none'"); |
| 193 shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-area
s')", "'none'"); | 209 shouldBe("getComputedStyle(element, '').getPropertyValue('grid-template-area
s')", "'none'"); |
| 194 | 210 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 208 testGridDefinitionsSetBadJSValues("none / 'a'"); | 224 testGridDefinitionsSetBadJSValues("none / 'a'"); |
| 209 testGridDefinitionsSetBadJSValues("25px / 'a' (name) 10px"); | 225 testGridDefinitionsSetBadJSValues("25px / 'a' (name) 10px"); |
| 210 testGridDefinitionsSetBadJSValues("'a' / 'b'"); | 226 testGridDefinitionsSetBadJSValues("'a' / 'b'"); |
| 211 testGridDefinitionsSetBadJSValues("15px"); | 227 testGridDefinitionsSetBadJSValues("15px"); |
| 212 testGridDefinitionsSetBadJSValues("15px / 20px none"); | 228 testGridDefinitionsSetBadJSValues("15px / 20px none"); |
| 213 testGridDefinitionsSetBadJSValues("25px / 10px 'a'"); | 229 testGridDefinitionsSetBadJSValues("25px / 10px 'a'"); |
| 214 | 230 |
| 215 </script> | 231 </script> |
| 216 </body> | 232 </body> |
| 217 </html> | 233 </html> |
| OLD | NEW |