Merge branch 'master' into selectmenu

24 files changed, 38 insertions, 37 deletions

diff --git a/tests/unit/accordion/all.html b/tests/unit/accordion/all.html
index 6c5d7787d..0d600e172 100644
--- a/tests/unit/accordion/all.html
+++ b/tests/unit/accordion/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/all.html b/tests/unit/all.html
index 87677ed6c..d5152bb48 100644
--- a/tests/unit/all.html
+++ b/tests/unit/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Test Suite</title>
 
-	<script src="../../jquery-1.7.js"></script>
+	<script src="../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../external/qunit.css">
 	<link rel="stylesheet" href="subsuiteRunner.css">
diff --git a/tests/unit/autocomplete/all.html b/tests/unit/autocomplete/all.html
index a136d8c25..c644e2728 100644
--- a/tests/unit/autocomplete/all.html
+++ b/tests/unit/autocomplete/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/autocomplete/autocomplete_events.js b/tests/unit/autocomplete/autocomplete_events.js
index 286d902f1..7b51ec4c0 100644
--- a/tests/unit/autocomplete/autocomplete_events.js
+++ b/tests/unit/autocomplete/autocomplete_events.js
@@ -157,22 +157,23 @@ asyncTest( "cancel select", function() {
 	}, 50 );
 });
 
-/* TODO previous fix broke more than it fixed, disabling this for now - messed up regular menu select event
-test("blur without selection", function() {
-	expect(1);
-	var ac = $("#autocomplete").autocomplete({
+asyncTest( "blur during remote search", function() {
+	expect( 1 );
+	var ac = $( "#autocomplete" ).autocomplete({
 		delay: 0,
-		source: data
+		source: function( request, response ) {
+			ok( true, "trigger request" );
+			ac.simulate( "blur" );
+			setTimeout(function() {
+				response([ "result" ]);
+				start();
+			}, 100 );
+		},
+		open: function() {
+			ok( false, "opened after a blur" );
+		}
 	});
-	stop();
-	ac.val("j").keydown();
-	setTimeout(function() {
-		$( ".ui-menu-item" ).first().simulate("mouseover");
-		ac.simulate("keydown", { keyCode: $.ui.keyCode.TAB });
-		deepEqual( ac.val(), "j" );
-		start();
-	}, 50);
+	ac.val( "ro" ).keydown();
 });
-*/
 
 }( jQuery ) );
diff --git a/tests/unit/button/all.html b/tests/unit/button/all.html
index 30222945d..fa9e22485 100644
--- a/tests/unit/button/all.html
+++ b/tests/unit/button/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Button Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/core/all.html b/tests/unit/core/all.html
index 2478a30af..e8d84e12f 100644
--- a/tests/unit/core/all.html
+++ b/tests/unit/core/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Core Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/datepicker/all.html b/tests/unit/datepicker/all.html
index c6f985d58..67d5cb2f9 100644
--- a/tests/unit/datepicker/all.html
+++ b/tests/unit/datepicker/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Datepicker Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/dialog/all.html b/tests/unit/dialog/all.html
index e65863678..e0416ecd1 100644
--- a/tests/unit/dialog/all.html
+++ b/tests/unit/dialog/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Dialog Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/draggable/all.html b/tests/unit/draggable/all.html
index 6a1bcc61b..3796d3f75 100644
--- a/tests/unit/draggable/all.html
+++ b/tests/unit/draggable/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Draggable Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/droppable/all.html b/tests/unit/droppable/all.html
index adb4d0ce9..e7f274c25 100644
--- a/tests/unit/droppable/all.html
+++ b/tests/unit/droppable/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Droppable Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/effects/all.html b/tests/unit/effects/all.html
index 8c12d76fd..56890ba1d 100644
--- a/tests/unit/effects/all.html
+++ b/tests/unit/effects/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Effects Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/menu/all.html b/tests/unit/menu/all.html
index c5f546ae0..38b76030b 100644
--- a/tests/unit/menu/all.html
+++ b/tests/unit/menu/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Menu Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/position/all.html b/tests/unit/position/all.html
index 8b300d011..07676f134 100644
--- a/tests/unit/position/all.html
+++ b/tests/unit/position/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Position Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/progressbar/all.html b/tests/unit/progressbar/all.html
index 73126b35c..52c195037 100644
--- a/tests/unit/progressbar/all.html
+++ b/tests/unit/progressbar/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Progressbar Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/resizable/all.html b/tests/unit/resizable/all.html
index 66ade12a8..2f56d02fd 100644
--- a/tests/unit/resizable/all.html
+++ b/tests/unit/resizable/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Resizable Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/selectable/all.html b/tests/unit/selectable/all.html
index f75846c85..e77829b4e 100644
--- a/tests/unit/selectable/all.html
+++ b/tests/unit/selectable/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Selectable Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/slider/all.html b/tests/unit/slider/all.html
index 382b0da3d..cbdbd2f5f 100644
--- a/tests/unit/slider/all.html
+++ b/tests/unit/slider/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Slider Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/sortable/all.html b/tests/unit/sortable/all.html
index 48001215f..0ee6b5648 100644
--- a/tests/unit/sortable/all.html
+++ b/tests/unit/sortable/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Sortable Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/spinner/all.html b/tests/unit/spinner/all.html
index e6e329fad..10753625f 100644
--- a/tests/unit/spinner/all.html
+++ b/tests/unit/spinner/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Spinner Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/subsuite.js b/tests/unit/subsuite.js
index 7818b6ff0..e584d2885 100644
--- a/tests/unit/subsuite.js
+++ b/tests/unit/subsuite.js
@@ -1,6 +1,6 @@
 (function() {
 
-var versions = [ "1.6", "1.6.1", "1.6.2", "1.6.3", "1.6.4", "1.7", "git" ];
+var versions = [ "1.6", "1.6.1", "1.6.2", "1.6.3", "1.6.4", "1.7", "1.7.1", "git" ];
 
 var additionalTests = {
 	accordion: [ "accordion_deprecated.html" ],
diff --git a/tests/unit/tabs/all.html b/tests/unit/tabs/all.html
index 58a1cb962..363edc002 100644
--- a/tests/unit/tabs/all.html
+++ b/tests/unit/tabs/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tabs Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/tooltip/all.html b/tests/unit/tooltip/all.html
index fac3c7070..0ef6e090e 100644
--- a/tests/unit/tooltip/all.html
+++ b/tests/unit/tooltip/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tooltip Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/widget/all.html b/tests/unit/widget/all.html
index 83df4905c..ae8bc3c66 100644
--- a/tests/unit/widget/all.html
+++ b/tests/unit/widget/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Widget Test Suite</title>
 
-	<script src="../../../jquery-1.7.js"></script>
+	<script src="../../../jquery-1.7.1.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
index edf1ae0fc..2e55ad703 100644
--- a/tests/unit/widget/widget_core.js
+++ b/tests/unit/widget/widget_core.js
@@ -1031,7 +1031,7 @@ test( "redefine", function() {
 	$.widget( "ui.testWidget", $.ui.testWidget, {
 		method: function( str ) {
 			equal( str, "foo", "new invoked with correct parameter" );
-			this._super();
+			this._super( "bar" );
 		}
 	});