Merge branch 'master' into selectmenu

4 files changed, 34 insertions, 5 deletions

diff --git a/tests/visual/dialog/animated.html b/tests/visual/dialog/animated.html
index d1f5acb10..07097fbfa 100644
--- a/tests/visual/dialog/animated.html
+++ b/tests/visual/dialog/animated.html
@@ -11,6 +11,7 @@
 	<script src="../../../ui/jquery.ui.draggable.js"></script>
 	<script src="../../../ui/jquery.ui.position.js"></script>
 	<script src="../../../ui/jquery.ui.resizable.js"></script>
+	<script src="../../../ui/jquery.ui.button.js"></script>
 	<script src="../../../ui/jquery.ui.dialog.js"></script>
 	<script src="../../../ui/jquery.ui.effect.js"></script>
 	<script src="../../../ui/jquery.ui.effect-blind.js"></script>
diff --git a/tests/visual/dialog/complex-dialogs.html b/tests/visual/dialog/complex-dialogs.html
index 6399d8a4b..5cd9271ae 100644
--- a/tests/visual/dialog/complex-dialogs.html
+++ b/tests/visual/dialog/complex-dialogs.html
@@ -11,6 +11,7 @@
 	<script src="../../../ui/jquery.ui.draggable.js"></script>
 	<script src="../../../ui/jquery.ui.position.js"></script>
 	<script src="../../../ui/jquery.ui.resizable.js"></script>
+	<script src="../../../ui/jquery.ui.button.js"></script>
 	<script src="../../../ui/jquery.ui.dialog.js"></script>
 
 	<!-- stuff needed to make things complex -->
@@ -23,9 +24,27 @@
 	$(function() {
 		var dialog = $( "#dialog" ).dialog({
 				modal: true,
-				height: 300,
-				width: 500
-			}),
+				width: 500,
+				buttons: [
+					{
+						click: $.noop,
+						icons: {
+							primary: "ui-icon-check"
+						},
+						text: "Ok"
+					},
+					{
+						click: function() {
+							$( this ).dialog( "close" );
+						},
+						icons: {
+							primary: "ui-icon-cancel"
+						},
+						text: "Cancel",
+						showText: false
+					}
+				]
+			}).dialog("option", "height", 600),
 
 			datepickerDialog = $( "#dialog-datepicker" ).dialog({
 				autoOpen: false,
@@ -62,6 +81,11 @@
 			]
 		});
 
+		$( "#destroy-dialog" ).click(function() {
+			dialog.dialog( "destroy" ).show();
+			$( this ).remove();
+		});
+
 		$( document ).tooltip();
 	});
 	</script>
@@ -71,18 +95,18 @@
 <p>WHAT: A modal dialog opening another modal dialog (including a datepicker), opening a non-modal dialog (including an autocomplete with tooltip applied). A regular link on the page, outside of the dialogs.</p>
 <p>EXPECTED: As long as a modal dialog is open, focus stays within the dialogs. Both mouse and keyboard interactions are captured and restricted to the dialog. When the nested modal dialog is open, the first modal dialog can't be interacted with, until the nested dialog is closed. When the third dialog is open (not modal), switching between the two dialogs is possible, both can be interacted with.</p>
 
-<a href="#">Outside link</a>
 
 <button id="open-dialog">Reopen dialog</button>
 
 <div id="dialog" title="Basic dialog">
 	<p>This is the default dialog which is useful for displaying information. The dialog window can be moved, resized and closed with the 'x' icon.</p>
 	<p><button id="open-datepicker">Open another window with a datepicker.</button></p>
+	<p><button id="destroy-dialog">Self destruct</button></p>
 </div>
 
 <div id="dialog-datepicker" title="A dialog with a datepicker">
 	<p>Date: <input id="datepicker"></p>
-	<p><button id="open-autocomplete">Open another window with an autocomplete and a tooltip.</button></p>
+	<p><button id="open-autocomplete" autofocus>Open another window with an autocomplete and a tooltip.</button></p>
 </div>
 
 <div id="dialog-autocomplete">
@@ -90,5 +114,7 @@
 	<input id="autocomplete" title="Try typing something!">
 </div>
 
+<a href="#">Outside link</a>
+
 </body>
 </html>
diff --git a/tests/visual/dialog/form.html b/tests/visual/dialog/form.html
index 867991911..ed70ec69b 100644
--- a/tests/visual/dialog/form.html
+++ b/tests/visual/dialog/form.html
@@ -11,6 +11,7 @@
 	<script src="../../../ui/jquery.ui.draggable.js"></script>
 	<script src="../../../ui/jquery.ui.position.js"></script>
 	<script src="../../../ui/jquery.ui.resizable.js"></script>
+	<script src="../../../ui/jquery.ui.button.js"></script>
 	<script src="../../../ui/jquery.ui.dialog.js"></script>
 	<script src="../../../ui/jquery.ui.effect.js"></script>
 	<script src="../../../ui/jquery.ui.effect-blind.js"></script>
diff --git a/tests/visual/dialog/performance.html b/tests/visual/dialog/performance.html
index 937b9464f..8f63d6a69 100644
--- a/tests/visual/dialog/performance.html
+++ b/tests/visual/dialog/performance.html
@@ -11,6 +11,7 @@
 	<script src="../../../ui/jquery.ui.mouse.js"></script>
 	<script src="../../../ui/jquery.ui.draggable.js"></script>
 	<script src="../../../ui/jquery.ui.resizable.js"></script>
+	<script src="../../../ui/jquery.ui.button.js"></script>
 	<script src="../../../ui/jquery.ui.dialog.js"></script>
 	<script>
 	$(function() {