From 90fb45dffafc2e891b1ebca948ad33e6b94de112 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 7 Jan 2010 03:19:50 +0000
Subject: Merged in /branches/dev r3251:3620 (excluding autocomplete, modal,
 tooltip, menu; including menu static tests).

---
 demos/dialog/animated.html           |  2 +-
 demos/dialog/default.html            |  2 +-
 demos/dialog/modal-confirmation.html |  1 +
 demos/dialog/modal-form.html         | 32 +++++++-------------------------
 demos/dialog/modal-message.html      |  1 +
 5 files changed, 11 insertions(+), 27 deletions(-)

(limited to 'demos/dialog')

diff --git a/demos/dialog/animated.html b/demos/dialog/animated.html
index 2bb96d369..dd84b25d4 100644
--- a/demos/dialog/animated.html
+++ b/demos/dialog/animated.html
@@ -17,7 +17,7 @@
 	<script type="text/javascript" src="../../ui/jquery.effects.explode.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
-	$.ui.dialog.defaults.stackfix = true;
+	$.ui.dialog.prototype.options.stackfix = true;
 	// increase the default animation speed to exaggerate the effect
 	$.fx.speeds._default = 1000;
 	$(function() {
diff --git a/demos/dialog/default.html b/demos/dialog/default.html
index 66f052d82..62638f399 100644
--- a/demos/dialog/default.html
+++ b/demos/dialog/default.html
@@ -14,7 +14,7 @@
 	<script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script>
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
-	$.ui.dialog.defaults.stackfix = true;
+	$.ui.dialog.prototype.options.stackfix = true;
 	$(function() {
 		$("#dialog").dialog();
 	});
diff --git a/demos/dialog/modal-confirmation.html b/demos/dialog/modal-confirmation.html
index bbb785c4b..8c5c0ba89 100644
--- a/demos/dialog/modal-confirmation.html
+++ b/demos/dialog/modal-confirmation.html
@@ -7,6 +7,7 @@
 	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
 	<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
 	<script type="text/javascript" src="../../ui/jquery.ui.mouse.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>
 	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
 	<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
 	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
diff --git a/demos/dialog/modal-form.html b/demos/dialog/modal-form.html
index d3eb00d77..ffcdd70fc 100644
--- a/demos/dialog/modal-form.html
+++ b/demos/dialog/modal-form.html
@@ -7,6 +7,7 @@
 	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
 	<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
 	<script type="text/javascript" src="../../ui/jquery.ui.mouse.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>
 	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
 	<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
 	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
@@ -23,7 +24,6 @@
 		div#users-contain { width: 350px; margin: 20px 0; }
 		div#users-contain table { margin: 1em 0; border-collapse: collapse; width: 100%; }
 		div#users-contain table td, div#users-contain table th { border: 1px solid #eee; padding: .6em 10px; text-align: left; }
-		.ui-button { outline: 0; margin: 0; padding: .4em 1em .5em; text-decoration: none; cursor: pointer; position: relative; text-align: center; }
 		.ui-dialog .ui-state-error { padding: .3em; }
 		.validateTips { border: 1px solid transparent; padding: 0.3em; }
 		
@@ -112,29 +112,11 @@
 		
 		
 		
-		$('#create-user').click(function() {
-			$('#dialog-form').dialog('open');
-		})
-		.hover(
-			function() {
-				$(this).addClass("ui-state-hover");
-			},
-			function() {
-				$(this).removeClass("ui-state-hover");
-			}
-		)
-		.focus(function() {
-			$(this).addClass('ui-state-focus');
-		})
-		.blur(function() {
-			$(this).removeClass('ui-state-focus');
-		})
-		.mousedown(function() {
-			$(this).addClass("ui-state-active");
-		})
-		.mouseup(function() {
-				$(this).removeClass("ui-state-active");
-		});
+		$('#create-user')
+			.button()
+			.click(function() {
+				$('#dialog-form').dialog('open');
+			});
 
 	});
 	</script>
@@ -181,7 +163,7 @@
 		</tbody>
 	</table>
 </div>
-<button id="create-user" class="ui-button ui-state-default ui-corner-all">Create new user</button>
+<button id="create-user">Create new user</button>
 
 </div><!-- End demo -->
 
diff --git a/demos/dialog/modal-message.html b/demos/dialog/modal-message.html
index fc1abb3b2..0fdae6a06 100644
--- a/demos/dialog/modal-message.html
+++ b/demos/dialog/modal-message.html
@@ -7,6 +7,7 @@
 	<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
 	<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
 	<script type="text/javascript" src="../../ui/jquery.ui.mouse.js"></script>
+	<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>
 	<script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script>
 	<script type="text/javascript" src="../../ui/jquery.ui.position.js"></script>
 	<script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script>
-- 
cgit v1.2.3