From d40993dcf674b63530998b9c0b4bb0191df7683a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jo=CC=88rn=20Zaefferer?= <joern.zaefferer@gmail.com>
Date: Mon, 23 Apr 2012 18:55:11 +0200
Subject: [PATCH] Fix various issues in our html files, third batch

---
 tests/static/datepicker/datepicker.html | 26 ++++-----
 tests/unit/core/core.html               |  2 -
 tests/unit/core/selector.js             | 76 ++++++++++++-------------
 3 files changed, 49 insertions(+), 55 deletions(-)

diff --git a/tests/static/datepicker/datepicker.html b/tests/static/datepicker/datepicker.html
index 89be6b1eb..857677cfd 100644
--- a/tests/static/datepicker/datepicker.html
+++ b/tests/static/datepicker/datepicker.html
@@ -90,7 +90,7 @@
 		</tbody>
 	</table>
 </div>
-	
+
 <!-- Datepicker with 1 combined select -->
 <div class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all">
 	<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix ui-corner-all">
@@ -98,7 +98,7 @@
 		<a title="Next" class="ui-datepicker-next ui-corner-all" href="#"><span class="ui-icon ui-icon-circle-triangle-e">Next</span></a>
 		<div class="ui-datepicker-title">
 			<select class="ui-datepicker-month-year">
-				<optgroup name="2007">
+				<optgroup label="2007">
 					<option value="2007_0">January 2007</option>
 					<option value="2007_1">February 2007</option>
 					<option value="2007_2">March 2007</option>
@@ -112,7 +112,7 @@
 					<option value="2007_10">November 2007</option>
 					<option value="2007_11">December 2007</option>
 				</optgroup>
-				<optgroup name="2008">
+				<optgroup label="2008">
 					<option value="2008_0">January 2008</option>
 					<option value="2008_1">February 2008</option>
 					<option value="2008_2">March 2008</option>
@@ -126,7 +126,7 @@
 					<option value="2008_10">November 2008</option>
 					<option selected="selected" value="2008_11">December 2008</option>
 				</optgroup>
-				<optgroup name="2009">
+				<optgroup label="2009">
 					<option value="2009_0">January 2009</option>
 					<option value="2009_1">February 2009</option>
 					<option value="2009_2">March 2009</option>
@@ -140,7 +140,7 @@
 					<option value="2009_10">November 2009</option>
 					<option value="2009_11">December 2009</option>
 				</optgroup>
-				<optgroup name="2010">
+				<optgroup label="2010">
 					<option value="2010_0">January 2010</option>
 					<option value="2010_1">February 2010</option>
 					<option value="2010_2">March 2010</option>
@@ -430,11 +430,11 @@
 				<td class="ui-datepicker-week-end ui-datepicker-other-month ui-datepicker-unselectable ui-state-disabled"></td>
 			</tr>
 		</tbody>
-	</table>		
+	</table>
 	<div class="ui-datepicker-buttonpane ui-widget-content">
 		<button class="ui-state-default ui-priority-primary ui-corner-all">Done</button>
 		<button class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all">Today</button>
-	</div> 
+	</div>
 </div>
 
 <!-- Multiple Datepickers with read only month/year -->
@@ -649,7 +649,7 @@
 				</td></tr>
 			</tbody>
 		</table>
-	</div>	
+	</div>
 	<div class="ui-datepicker-group ui-datepicker-group-middle">
 		<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix">
 			<div class="ui-datepicker-title">
@@ -863,7 +863,7 @@
 				</td></tr>
 			</tbody>
 		</table>
-	</div>	
+	</div>
 	<div class="ui-datepicker-group ui-datepicker-group-middle">
 		<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix">
 			<div class="ui-datepicker-title">
@@ -924,7 +924,7 @@
 					<td class="ui-datepicker-week-end"><a href="#" class="ui-state-default">23</a></td>
 					<td class=""><a href="#" class="ui-state-default">24</a></td>
 					<td class=""><a href="#" class="ui-state-default">25</a></td>
-					<td class=""><a href="#" class="ui-state-default">26</a></td>					
+					<td class=""><a href="#" class="ui-state-default">26</a></td>
 					<td class=""><a href="#" class="ui-state-default">27</a></td>
 					<td class=""><a href="#" class="ui-state-default">28</a></td>
 					<td class="ui-datepicker-week-end"><a href="#" class="ui-state-default">29</a></td>
@@ -1077,8 +1077,8 @@
 				</td></tr>
 			</tbody>
 		</table>
-	</div>	
-	
+	</div>
+
 	<div class="ui-datepicker-row-break"></div>
 	<div class="ui-datepicker-group ui-datepicker-group-first">
 		<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix">
@@ -1344,7 +1344,7 @@
 					<td class="ui-datepicker-week-end"><a href="#" class="ui-state-default">23</a></td>
 					<td class=""><a href="#" class="ui-state-default">24</a></td>
 					<td class=""><a href="#" class="ui-state-default">25</a></td>
-					<td class=""><a href="#" class="ui-state-default">26</a></td>					
+					<td class=""><a href="#" class="ui-state-default">26</a></td>
 					<td class=""><a href="#" class="ui-state-default">27</a></td>
 					<td class=""><a href="#" class="ui-state-default">28</a></td>
 					<td class="ui-datepicker-week-end"><a href="#" class="ui-state-default">29</a></td>
diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html
index 0df138873..272b15d2c 100644
--- a/tests/unit/core/core.html
+++ b/tests/unit/core/core.html
@@ -39,9 +39,7 @@
 
 <img src="../images/jqueryui_32x32.png" usemap="#mymap" width="10" height="10" alt="">
 <map name="mymap">
-	<area shape="rect" coords="0,0,1,1" id="areaCoordsNoHref" alt="">
 	<area shape="rect" coords="1,1,2,2" href="foo.html" id="areaCoordsHref" alt="">
-	<area shape="rect" coords="0,0,0,0" href="foo.html" id="areaCoordsNoSizeHref" alt="">
 	<area href="foo.html" id="areaNoCoordsHref" alt="">
 </map>
 <map name="mymap2">
diff --git a/tests/unit/core/selector.js b/tests/unit/core/selector.js
index 2fb78025c..4309289c9 100644
--- a/tests/unit/core/selector.js
+++ b/tests/unit/core/selector.js
@@ -6,24 +6,24 @@
 module("core - selectors");
 
 function isFocusable(selector, msg) {
-	ok($(selector).is(':focusable'), msg + " - selector " + selector + " is focusable");
+	QUnit.push($(selector).is(':focusable'), null, null, msg + " - selector " + selector + " is focusable");
 }
 
 function isNotFocusable(selector, msg) {
-	ok($(selector).length && !$(selector).is(':focusable'), msg + " - selector " + selector + " is not focusable");
+	QUnit.push($(selector).length && !$(selector).is(':focusable'), null, null, msg + " - selector " + selector + " is not focusable");
 }
 
 function isTabbable(selector, msg) {
-	ok($(selector).is(':tabbable'), msg + " - selector " + selector + " is tabbable");
+	QUnit.push($(selector).is(':tabbable'), null, null, msg + " - selector " + selector + " is tabbable");
 }
 
 function isNotTabbable(selector, msg) {
-	ok($(selector).length && !$(selector).is(':tabbable'), msg + " - selector " + selector + " is not tabbable");
+	QUnit.push($(selector).length && !$(selector).is(':tabbable'), null, null, msg + " - selector " + selector + " is not tabbable");
 }
 
 test("data", function() {
 	expect(15);
-	
+
 	var el;
 	function shouldHaveData(msg) {
 		ok(el.is(':data(test)'), msg);
@@ -31,56 +31,56 @@ test("data", function() {
 	function shouldNotHaveData(msg) {
 		ok(!el.is(':data(test)'), msg);
 	}
-	
+
 	el = $('<div>');
 	shouldNotHaveData('data never set');
-	
+
 	el = $('<div>').data('test', null);
 	shouldNotHaveData('data is null');
-	
+
 	el = $('<div>').data('test', true);
 	shouldHaveData('data set to true');
-	
+
 	el = $('<div>').data('test', false);
 	shouldNotHaveData('data set to false');
-	
+
 	el = $('<div>').data('test', 0);
 	shouldNotHaveData('data set to 0');
-	
+
 	el = $('<div>').data('test', 1);
 	shouldHaveData('data set to 1');
-	
+
 	el = $('<div>').data('test', '');
 	shouldNotHaveData('data set to empty string');
-	
+
 	el = $('<div>').data('test', 'foo');
 	shouldHaveData('data set to string');
-	
+
 	el = $('<div>').data('test', []);
 	shouldHaveData('data set to empty array');
-	
+
 	el = $('<div>').data('test', [1]);
 	shouldHaveData('data set to array');
-	
+
 	el = $('<div>').data('test', {});
 	shouldHaveData('data set to empty object');
-	
+
 	el = $('<div>').data('test', {foo: 'bar'});
 	shouldHaveData('data set to object');
-	
+
 	el = $('<div>').data('test', new Date());
 	shouldHaveData('data set to date');
-	
+
 	el = $('<div>').data('test', /test/);
 	shouldHaveData('data set to regexp');
-	
+
 	el = $('<div>').data('test', function() {});
 	shouldHaveData('data set to function');
 });
 
 test("focusable - visible, enabled elements", function() {
 	expect(18);
-	
+
 	isNotFocusable('#formNoTabindex', 'form');
 	isFocusable('#formTabindex', 'form with tabindex');
 	isFocusable('#visibleAncestor-inputTypeNone', 'input, no type');
@@ -103,7 +103,7 @@ test("focusable - visible, enabled elements", function() {
 
 test("focusable - disabled elements", function() {
 	expect(9);
-	
+
 	isNotFocusable('#disabledElement-inputTypeNone', 'input, no type');
 	isNotFocusable('#disabledElement-inputTypeText', 'input, type text');
 	isNotFocusable('#disabledElement-inputTypeCheckbox', 'input, type checkbox');
@@ -117,23 +117,23 @@ test("focusable - disabled elements", function() {
 
 test("focusable - hidden styles", function() {
 	expect(8);
-	
+
 	isNotFocusable('#displayNoneAncestor-input', 'input, display: none parent');
 	isNotFocusable('#displayNoneAncestor-span', 'span with tabindex, display: none parent');
-	
+
 	isNotFocusable('#visibilityHiddenAncestor-input', 'input, visibility: hidden parent');
 	isNotFocusable('#visibilityHiddenAncestor-span', 'span with tabindex, visibility: hidden parent');
-	
+
 	isNotFocusable('#displayNone-input', 'input, display: none');
 	isNotFocusable('#visibilityHidden-input', 'input, visibility: hidden');
-	
+
 	isNotFocusable('#displayNone-span', 'span with tabindex, display: none');
 	isNotFocusable('#visibilityHidden-span', 'span with tabindex, visibility: hidden');
 });
 
 test("focusable - natively focusable with various tabindex", function() {
 	expect(4);
-	
+
 	isFocusable('#inputTabindex0', 'input, tabindex 0');
 	isFocusable('#inputTabindex10', 'input, tabindex 10');
 	isFocusable('#inputTabindex-1', 'input, tabindex -1');
@@ -142,7 +142,7 @@ test("focusable - natively focusable with various tabindex", function() {
 
 test("focusable - not natively focusable with various tabindex", function() {
 	expect(4);
-	
+
 	isFocusable('#spanTabindex0', 'span, tabindex 0');
 	isFocusable('#spanTabindex10', 'span, tabindex 10');
 	isFocusable('#spanTabindex-1', 'span, tabindex -1');
@@ -150,16 +150,14 @@ test("focusable - not natively focusable with various tabindex", function() {
 });
 
 test("focusable - area elements", function() {
-	isNotFocusable('#areaCoordsNoHref', 'coords but no href');
 	isFocusable('#areaCoordsHref', 'coords and href');
-	isFocusable('#areaCoordsNoSizeHref', 'coords of zero px and href');
 	isFocusable('#areaNoCoordsHref', 'href but no coords');
 	isNotFocusable('#areaNoImg', 'not associated with an image');
 });
 
 test("tabbable - visible, enabled elements", function() {
 	expect(18);
-	
+
 	isNotTabbable('#formNoTabindex', 'form');
 	isTabbable('#formTabindex', 'form with tabindex');
 	isTabbable('#visibleAncestor-inputTypeNone', 'input, no type');
@@ -182,7 +180,7 @@ test("tabbable - visible, enabled elements", function() {
 
 test("tabbable - disabled elements", function() {
 	expect(9);
-	
+
 	isNotTabbable('#disabledElement-inputTypeNone', 'input, no type');
 	isNotTabbable('#disabledElement-inputTypeText', 'input, type text');
 	isNotTabbable('#disabledElement-inputTypeCheckbox', 'input, type checkbox');
@@ -196,23 +194,23 @@ test("tabbable - disabled elements", function() {
 
 test("tabbable - hidden styles", function() {
 	expect(8);
-	
+
 	isNotTabbable('#displayNoneAncestor-input', 'input, display: none parent');
 	isNotTabbable('#displayNoneAncestor-span', 'span with tabindex, display: none parent');
-	
+
 	isNotTabbable('#visibilityHiddenAncestor-input', 'input, visibility: hidden parent');
 	isNotTabbable('#visibilityHiddenAncestor-span', 'span with tabindex, visibility: hidden parent');
-	
+
 	isNotTabbable('#displayNone-input', 'input, display: none');
 	isNotTabbable('#visibilityHidden-input', 'input, visibility: hidden');
-	
+
 	isNotTabbable('#displayNone-span', 'span with tabindex, display: none');
 	isNotTabbable('#visibilityHidden-span', 'span with tabindex, visibility: hidden');
 });
 
 test("tabbable -  natively tabbable with various tabindex", function() {
 	expect(4);
-	
+
 	isTabbable('#inputTabindex0', 'input, tabindex 0');
 	isTabbable('#inputTabindex10', 'input, tabindex 10');
 	isNotTabbable('#inputTabindex-1', 'input, tabindex -1');
@@ -221,7 +219,7 @@ test("tabbable -  natively tabbable with various tabindex", function() {
 
 test("tabbable -  not natively tabbable with various tabindex", function() {
 	expect(4);
-	
+
 	isTabbable('#spanTabindex0', 'span, tabindex 0');
 	isTabbable('#spanTabindex10', 'span, tabindex 10');
 	isNotTabbable('#spanTabindex-1', 'span, tabindex -1');
@@ -229,9 +227,7 @@ test("tabbable -  not natively tabbable with various tabindex", function() {
 });
 
 test("tabbable - area elements", function() {
-	isNotTabbable('#areaCoordsNoHref', 'coords but no href');
 	isTabbable('#areaCoordsHref', 'coords and href');
-	isTabbable('#areaCoordsNoSizeHref', 'coords of zero px and href');
 	isTabbable('#areaNoCoordsHref', 'href but no coords');
 	isNotTabbable('#areaNoImg', 'not associated with an image');
 });
-- 
2.39.5