Fix a lint error for w3c-test.org in css/
Seems like a good idea to have it enabled...
diff --git a/css/css-values/viewport-units-css2-001.html b/css/css-values/viewport-units-css2-001.html
index fb95a22..f0feb6d 100644
--- a/css/css-values/viewport-units-css2-001.html
+++ b/css/css-values/viewport-units-css2-001.html
@@ -1,259 +1,233 @@
<!DOCTYPE html>
<html>
<head>
+ <title>CSS Values and Units Test: Checks viewport units against CSS 2.1 properties and the CSSOM</title>
+ <meta name="assert" content="Testing what happens when one applies and rereads viewport unit lengths to CSS 2.1 properties that accept length values" />
+ <link rel="author" title="Christian Schaefer" href="mailto:schaepp@gmx.de">
+ <link rel="help" href="http://www.w3.org/TR/css3-values/#viewport-relative-lengths">
+ <script src="/resources/testharness.js"></script>
+ <script src="/resources/testharnessreport.js"></script>
+ <style>
+ #div {
+ position: relative;
+ width: 50vw;
+ height: 10vw;
+ background: green;
+ border: 0 green solid;
+ font-size: 4vw;
+ }
- <title>
- CSS Values and Units Test:
- Checks viewport units against CSS 2.1 properties and the CSSOM
- </title>
- <meta name="assert" content="Testing what happens when one applies and rereads viewport unit lengths to CSS 2.1 properties that accept length values" />
-
- <link
- rel="author"
- title="Christian Schaefer"
- href="mailto:schaepp@gmx.de"
- / >
-
- <!-- You must have at least one spec link, but may have as many as are covered in the test. -->
- <!-- Be sure to make the main testing area first in the order -->
- <link rel="help" href="http://www.w3.org/TR/css3-values/#viewport-relative-lengths">
-
- <!-- testharness inclusion for later submission -->
- <script src="/resources/testharness.js"></script>
- <script src="/resources/testharnessreport.js"></script>
-
- <!-- testharness fallback for local testing -->
- <script>
- window.test || document.write('\
- <script src="http://www.w3c-test.org/resources/testharness.js"><\/script>\
- <script src="http://www.w3c-test.org/resources/testharnessreport.js"><\/script>\
- ');
- </script>
-
- <style>
-
- #div {
- position: relative;
- width: 50vw;
- height: 10vw;
- background: green;
- border: 0 green solid;
- font-size: 4vw;
- }
-
- #table td {
- border: 1px solid green;
- }
-
- </style>
-
+ #table td {
+ border: 1px solid green;
+ }
+ </style>
</head>
<body>
- <div id="log"></div>
+ <div id="log"></div>
- <p>
- Checks viewport units. Also re-check with zoom in/out.
- </p>
+ <p>
+ Checks viewport units. Also re-check with zoom in/out.
+ </p>
- <div id="div">
- Test the Web Forward!
- </div>
+ <div id="div">
+ Test the Web Forward!
+ </div>
- <table id="table">
- <tbody>
- <tr>
- <td id="td">Test</td>
- <td>T</td>
- <td>W</td>
- <td>F</td>
- </tr>
- </tbody>
- </table>
+ <table id="table">
+ <tbody>
+ <tr>
+ <td id="td">Test</td>
+ <td>T</td>
+ <td>W</td>
+ <td>F</td>
+ </tr>
+ </tbody>
+ </table>
- <script>
+ <script>
- /* Boilerplate code */
+ /* Boilerplate code */
- var camelize = function (str) {
- return str.replace(/\-(\w)/g, function(str, letter){
- return letter.toUpperCase();
- });
- };
+ var camelize = function (str) {
+ return str.replace(/\-(\w)/g, function(str, letter){
+ return letter.toUpperCase();
+ });
+ };
- var retrieveComputedStyle = function(element,property){
- var result =
- document
- .defaultView
- .getComputedStyle(element,null)
- .getPropertyValue(property);
+ var retrieveComputedStyle = function(element,property){
+ var result =
+ document
+ .defaultView
+ .getComputedStyle(element,null)
+ .getPropertyValue(property);
- // If there are multiple values, cut down to the first
- result = result.split(' ')[0];
+ // If there are multiple values, cut down to the first
+ result = result.split(' ')[0];
- if(window.console) console.log('Retrieving ' + property + ' property. Result: ' + result);
+ if(window.console) console.log('Retrieving ' + property + ' property. Result: ' + result);
- return result;
- }
+ return result;
+ }
- var testit = function(element,vunit,property,expectedResult){
+ var testit = function(element,vunit,property,expectedResult){
- element.style[camelize(property)] = '0px';
- element.style[camelize(property)] = lengthAmount + vunit;
+ element.style[camelize(property)] = '0px';
+ element.style[camelize(property)] = lengthAmount + vunit;
- if(window.console) console.log(element.nodeName.toLowerCase() + '.style.' + camelize(property) + ' = ' + lengthAmount + vunit);
+ if(window.console) console.log(element.nodeName.toLowerCase() + '.style.' + camelize(property) + ' = ' + lengthAmount + vunit);
- var result = retrieveComputedStyle(element,property);
+ var result = retrieveComputedStyle(element,property);
- // Test against WebKit's getComputedStyle bug, where it does not return absolute values
- // As required here: http://www.w3.org/TR/1998/REC-CSS2-19980512/cascade.html#computed-value
- // If it returns a pixel value, but this value is 0px then it is considered a fail, too.
- var px_result = result.search(/^[-\d\.]+px$/) !== -1 && result !== '0px' ? 'non-zero px-based value' : result;
+ // Test against WebKit's getComputedStyle bug, where it does not return absolute values
+ // As required here: http://www.w3.org/TR/1998/REC-CSS2-19980512/cascade.html#computed-value
+ // If it returns a pixel value, but this value is 0px then it is considered a fail, too.
+ var px_result = result.search(/^[-\d\.]+px$/) !== -1 && result !== '0px' ? 'non-zero px-based value' : result;
- // If browser returns pixel value, we compare against our expected pixel value
- if(px_result === 'non-zero px-based value'){
- test(function(){
- assert_equals(Math.round(parseFloat(result.replace(/[^-\d\.]+/g,''))),expectedResult);
- },vunit + ' length applied to ' + property);
- }
- // If not, we compare against the value we set initially
- else {
- test(function(){
- assert_equals(result,lengthAmount + vunit);
- },vunit + ' length applied to ' + property);
- }
+ // If browser returns pixel value, we compare against our expected pixel value
+ if(px_result === 'non-zero px-based value'){
+ test(function(){
+ assert_equals(Math.round(parseFloat(result.replace(/[^-\d\.]+/g,''))),expectedResult);
+ },vunit + ' length applied to ' + property);
+ }
+ // If not, we compare against the value we set initially
+ else {
+ test(function(){
+ assert_equals(result,lengthAmount + vunit);
+ },vunit + ' length applied to ' + property);
+ }
- // Does the browser have a bug in getComputedStyle or not?
- test(function(){
- assert_equals(px_result,'non-zero px-based value');
- },vunit + ' length applied to ' + property + ': getComputedStyle returns a non-zero px-based value');
+ // Does the browser have a bug in getComputedStyle or not?
+ test(function(){
+ assert_equals(px_result,'non-zero px-based value');
+ },vunit + ' length applied to ' + property + ': getComputedStyle returns a non-zero px-based value');
- element.style[camelize(property)] = '';
- }
+ element.style[camelize(property)] = '';
+ }
- var lengthAmount = 10;
- var layoutViewportWidth = document.documentElement.clientWidth;
- var layoutViewportHeight = document.documentElement.clientHeight;
+ var lengthAmount = 10;
+ var layoutViewportWidth = document.documentElement.clientWidth;
+ var layoutViewportHeight = document.documentElement.clientHeight;
- var viewportUnits = [
- {
- ident: 'vw',
- expectedResult: Math.round(layoutViewportWidth * (lengthAmount / 100))
- }
- ,{
- ident: 'vh',
- expectedResult: Math.round(layoutViewportHeight * (lengthAmount / 100))
- }
- ,{
- ident: 'vmin',
- expectedResult: layoutViewportWidth < layoutViewportHeight ? Math.round(layoutViewportWidth * (lengthAmount / 100)) : Math.round(layoutViewportHeight * (lengthAmount / 100))
- }
- ,{
- ident: 'vmax',
- expectedResult: layoutViewportWidth > layoutViewportHeight ? Math.round(layoutViewportWidth * (lengthAmount / 100)) : Math.round(layoutViewportHeight * (lengthAmount / 100))
- }
- ]
+ var viewportUnits = [
+ {
+ ident: 'vw',
+ expectedResult: Math.round(layoutViewportWidth * (lengthAmount / 100))
+ }
+ ,{
+ ident: 'vh',
+ expectedResult: Math.round(layoutViewportHeight * (lengthAmount / 100))
+ }
+ ,{
+ ident: 'vmin',
+ expectedResult: layoutViewportWidth < layoutViewportHeight ? Math.round(layoutViewportWidth * (lengthAmount / 100)) : Math.round(layoutViewportHeight * (lengthAmount / 100))
+ }
+ ,{
+ ident: 'vmax',
+ expectedResult: layoutViewportWidth > layoutViewportHeight ? Math.round(layoutViewportWidth * (lengthAmount / 100)) : Math.round(layoutViewportHeight * (lengthAmount / 100))
+ }
+ ]
- // List of length accepting properties and which element they map to
- // http://www.w3.org/TR/CSS21/propidx.html
- var lengthAcceptingProperties = [
- {
- name: 'width',
- element: 'div'
- }
- ,{
- name: 'height',
- element: 'div'
- }
- ,{
- name: 'min-width',
- element: 'div'
- }
- ,{
- name: 'min-height',
- element: 'div'
- }
- ,{
- name: 'max-width',
- element: 'div'
- }
- ,{
- name: 'max-height',
- element: 'div'
- }
- ,{
- name: 'margin-top',
- element: 'div'
- }
- ,{
- name: 'padding-top',
- element: 'div'
- }
- ,{
- name: 'border-top-width',
- element: 'div'
- }
- ,{
- name: 'font-size',
- element: 'div'
- }
- ,{
- name: 'line-height',
- element: 'div'
- }
- ,{
- name: 'border-spacing',
- element: 'table'
- }
- ,{
- name: 'top',
- element: 'div'
- }
- ,{
- name: 'right',
- element: 'div'
- }
- ,{
- name: 'bottom',
- element: 'div'
- }
- ,{
- name: 'left',
- element: 'div'
- }
- ,{
- name: 'letter-spacing',
- element: 'div'
- }
- ,{
- name: 'text-indent',
- element: 'div'
- }
- ,{
- name: 'vertical-align',
- element: 'td'
- }
- ,{
- name: 'word-spacing',
- element: 'div'
- }
- ];
+ // List of length accepting properties and which element they map to
+ // http://www.w3.org/TR/CSS21/propidx.html
+ var lengthAcceptingProperties = [
+ {
+ name: 'width',
+ element: 'div'
+ }
+ ,{
+ name: 'height',
+ element: 'div'
+ }
+ ,{
+ name: 'min-width',
+ element: 'div'
+ }
+ ,{
+ name: 'min-height',
+ element: 'div'
+ }
+ ,{
+ name: 'max-width',
+ element: 'div'
+ }
+ ,{
+ name: 'max-height',
+ element: 'div'
+ }
+ ,{
+ name: 'margin-top',
+ element: 'div'
+ }
+ ,{
+ name: 'padding-top',
+ element: 'div'
+ }
+ ,{
+ name: 'border-top-width',
+ element: 'div'
+ }
+ ,{
+ name: 'font-size',
+ element: 'div'
+ }
+ ,{
+ name: 'line-height',
+ element: 'div'
+ }
+ ,{
+ name: 'border-spacing',
+ element: 'table'
+ }
+ ,{
+ name: 'top',
+ element: 'div'
+ }
+ ,{
+ name: 'right',
+ element: 'div'
+ }
+ ,{
+ name: 'bottom',
+ element: 'div'
+ }
+ ,{
+ name: 'left',
+ element: 'div'
+ }
+ ,{
+ name: 'letter-spacing',
+ element: 'div'
+ }
+ ,{
+ name: 'text-indent',
+ element: 'div'
+ }
+ ,{
+ name: 'vertical-align',
+ element: 'td'
+ }
+ ,{
+ name: 'word-spacing',
+ element: 'div'
+ }
+ ];
- var div = document.getElementById('div');
- var table = document.getElementById('table');
- var td = document.getElementById('td');
+ var div = document.getElementById('div');
+ var table = document.getElementById('table');
+ var td = document.getElementById('td');
- for(unitEntry in viewportUnits){
- for(propertyEntry in lengthAcceptingProperties){
+ for(unitEntry in viewportUnits){
+ for(propertyEntry in lengthAcceptingProperties){
- var vunit = viewportUnits[unitEntry].ident;
- var expectedResult = viewportUnits[unitEntry].expectedResult;
- var property = lengthAcceptingProperties[propertyEntry].name;
- var element = window[lengthAcceptingProperties[propertyEntry].element];
+ var vunit = viewportUnits[unitEntry].ident;
+ var expectedResult = viewportUnits[unitEntry].expectedResult;
+ var property = lengthAcceptingProperties[propertyEntry].name;
+ var element = window[lengthAcceptingProperties[propertyEntry].element];
- testit(element,vunit,property,expectedResult);
- }
- }
+ testit(element,vunit,property,expectedResult);
+ }
+ }
- </script>
+ </script>
</body>
</html>
diff --git a/lint.whitelist b/lint.whitelist
index 325e8a3..c669054 100644
--- a/lint.whitelist
+++ b/lint.whitelist
@@ -375,7 +375,6 @@
OPEN-NO-MODE: css/*
PARSE-FAILED: css/*
PRINT STATEMENT: css/*
-W3C-TEST.ORG: css/*
CONTENT-VISUAL: css/*
CONTENT-MANUAL: css/*
