Merge
authorMichael Cooper <cooper@w3.org>
Tue, 30 Oct 2012 12:49:49 +0100
changeset 28 0e2afd1868a9
parent 27 05753f9a8c65 (current diff)
parent 23 92bb8877bd0b (diff)
child 29 655ab27634cc
Merge
--- a/ARIA/1.0/tests/test-files/accessible-name-input/checkbox-label-embedded-slider.html	Tue Oct 30 12:43:54 2012 +0100
+++ b/ARIA/1.0/tests/test-files/accessible-name-input/checkbox-label-embedded-slider.html	Tue Oct 30 12:49:49 2012 +0100
@@ -7,7 +7,7 @@
    <body>
    	<input type="checkbox" id="test" />
    	<label for="test">Flash the screen 
-   		<label for="test">foo <input role="slider" type="text" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
+   		<label for="test">foo <input role="slider" type="range" value="5" min="1" max="10" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
    		times.
    	</label>
    </body>
--- a/ARIA/1.0/tests/test-files/accessible-name-input/checkbox-label-embedded-spinbutton.html	Tue Oct 30 12:43:54 2012 +0100
+++ b/ARIA/1.0/tests/test-files/accessible-name-input/checkbox-label-embedded-spinbutton.html	Tue Oct 30 12:49:49 2012 +0100
@@ -7,7 +7,7 @@
    <body>
    	<input type="checkbox" id="test" />
    	<label for="test">Flash the screen 
-   		<label for="test">foo <input role="spinbutton" type="text" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
+   		<label for="test">foo <input role="spinbutton" type="text" value="5" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
    		times.
    	</label>
    </body>
--- a/ARIA/1.0/tests/test-files/accessible-name-input/file-label-embedded-slider.html	Tue Oct 30 12:43:54 2012 +0100
+++ b/ARIA/1.0/tests/test-files/accessible-name-input/file-label-embedded-slider.html	Tue Oct 30 12:49:49 2012 +0100
@@ -7,7 +7,7 @@
    <body>
    	<input type="file" id="test" />
    	<label for="test">Flash the screen 
-   		<label for="test">foo <input role="slider" type="text" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
+   		<label for="test">foo <input role="slider" type="range" value="5" min="1" max="10" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
    		times.
    	</label>
    </body>
--- a/ARIA/1.0/tests/test-files/accessible-name-input/file-label-embedded-spinbutton.html	Tue Oct 30 12:43:54 2012 +0100
+++ b/ARIA/1.0/tests/test-files/accessible-name-input/file-label-embedded-spinbutton.html	Tue Oct 30 12:49:49 2012 +0100
@@ -7,7 +7,7 @@
    <body>
    	<input type="file" id="test" />
    	<label for="test">Flash the screen 
-   		<label for="test">foo <input role="spinbutton" type="text" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
+   		<label for="test">foo <input role="spinbutton" type="text" value="5" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
    		times.
    	</label>
    </body>
--- a/ARIA/1.0/tests/test-files/accessible-name-input/password-label-embedded-slider.html	Tue Oct 30 12:43:54 2012 +0100
+++ b/ARIA/1.0/tests/test-files/accessible-name-input/password-label-embedded-slider.html	Tue Oct 30 12:49:49 2012 +0100
@@ -7,7 +7,7 @@
    <body>
    	<input type="password" id="test" />
    	<label for="test">Flash the screen 
-   		<label for="test">foo <input role="slider" type="text" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
+   		<label for="test">foo <input role="slider" type="range" value="5" min="1" max="10" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
    		times.
    	</label>
    </body>
--- a/ARIA/1.0/tests/test-files/accessible-name-input/password-label-embedded-spinbutton.html	Tue Oct 30 12:43:54 2012 +0100
+++ b/ARIA/1.0/tests/test-files/accessible-name-input/password-label-embedded-spinbutton.html	Tue Oct 30 12:49:49 2012 +0100
@@ -7,7 +7,7 @@
    <body>
    	<input type="password" id="test" />
    	<label for="test">Flash the screen 
-   		<label for="test">foo <input role="spinbutton" type="text" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
+   		<label for="test">foo <input role="spinbutton" type="text" value="5" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
    		times.
    	</label>
    </body>
--- a/ARIA/1.0/tests/test-files/accessible-name-input/radio-label-embedded-slider.html	Tue Oct 30 12:43:54 2012 +0100
+++ b/ARIA/1.0/tests/test-files/accessible-name-input/radio-label-embedded-slider.html	Tue Oct 30 12:49:49 2012 +0100
@@ -7,7 +7,7 @@
    <body>
    	<input type="radio" id="test" />
    	<label for="test">Flash the screen 
-   		<label for="test">foo <input role="slider" type="text" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
+   		<label for="test">foo <input role="slider" type="range" value="5" min="1" max="10" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
    		times.
    	</label>
    </body>
--- a/ARIA/1.0/tests/test-files/accessible-name-input/radio-label-embedded-spinbutton.html	Tue Oct 30 12:43:54 2012 +0100
+++ b/ARIA/1.0/tests/test-files/accessible-name-input/radio-label-embedded-spinbutton.html	Tue Oct 30 12:49:49 2012 +0100
@@ -7,7 +7,7 @@
    <body>
    	<input type="radio" id="test" />
    	<label for="test">Flash the screen 
-   		<label for="test">foo <input role="spinbutton" type="text" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
+   		<label for="test">foo <input role="spinbutton" type="text" value="5" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
    		times.
    	</label>
    </body>
--- a/ARIA/1.0/tests/test-files/accessible-name-input/text-label-embedded-slider.html	Tue Oct 30 12:43:54 2012 +0100
+++ b/ARIA/1.0/tests/test-files/accessible-name-input/text-label-embedded-slider.html	Tue Oct 30 12:49:49 2012 +0100
@@ -7,7 +7,7 @@
    <body>
    	<input type="text" id="test" />
    	<label for="test">Flash the screen 
-   		<label for="test">foo <input role="slider" type="text" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
+   		<label for="test">foo <input role="slider" type="range" value="5" min="1" max="10" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
    		times.
    	</label>
    </body>
--- a/ARIA/1.0/tests/test-files/accessible-name-input/text-label-embedded-spinbutton.html	Tue Oct 30 12:43:54 2012 +0100
+++ b/ARIA/1.0/tests/test-files/accessible-name-input/text-label-embedded-spinbutton.html	Tue Oct 30 12:49:49 2012 +0100
@@ -7,7 +7,7 @@
    <body>
    	<input type="text" id="test" />
    	<label for="test">Flash the screen 
-   		<label for="test">foo <input role="spinbutton" type="text" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
+   		<label for="test">foo <input role="spinbutton" type="text" value="5" aria-valuenow="5" aria-valuemin="1" aria-valuemax="10"> baz</label>
    		times.
    	</label>
    </body>
--- a/ARIA/1.0/tests/test-files/presentation-role/496.html	Tue Oct 30 12:43:54 2012 +0100
+++ b/ARIA/1.0/tests/test-files/presentation-role/496.html	Tue Oct 30 12:49:49 2012 +0100
@@ -1,10 +1,9 @@
 <html>
 <head>
-<title>Test 496 Image element with role="presentation" but controlled by an button </title>
+<title>Test 496 Button element with role="presentation" that 'controls' an image.</title>
 </head>
 <body>
-<img src="foo.jpg" alt="test1" width="40" height="40" role="presentation" id="foo"/>
-<input type="button" value="I control the Image" aria-controls="foo"/>
+<img src="foo.jpg" alt="test1" width="40" height="40" id="foo">
+<input role="presentation" type="button" value="I control the Image" aria-controls="foo">
 </body>
 </html>
-