Merge branch 'master' into grid

davidmurdoch · Apr 29, 2011 · fc70ad7 · fc70ad7
2 parents 97d8a2b + fe3b36b
commit fc70ad7
Show file tree

Hide file tree

Showing 58 changed files with 1,852 additions and 1,359 deletions.
diff --git a/demos/demos.css b/demos/demos.css
@@ -320,10 +320,10 @@ div.demo-description {
 #widget-docs .ui-tabs-nav li a:hover,
 #widget-docs .ui-tabs-nav li a:active { font-size:14px; padding:4px 1.2em 3px; color:#fff; }
 
-#widget-docs .ui-tabs-nav li.ui-tabs-selected a:link,
-#widget-docs .ui-tabs-nav li.ui-tabs-selected a:visited,
-#widget-docs .ui-tabs-nav li.ui-tabs-selected a:hover,
-#widget-docs .ui-tabs-nav li.ui-tabs-selected a:active { color:#e6820E; }
+#widget-docs .ui-tabs-nav li.ui-tabs-active a:link,
+#widget-docs .ui-tabs-nav li.ui-tabs-active a:visited,
+#widget-docs .ui-tabs-nav li.ui-tabs-active a:hover,
+#widget-docs .ui-tabs-nav li.ui-tabs-active a:active { color:#e6820E; }
 
 #widget-docs .ui-tabs-panel { padding:20px 9px; font-size:12px; line-height:1.4; color:#000; }
 

diff --git a/demos/tabs/ajax.html b/demos/tabs/ajax.html
@@ -12,13 +12,12 @@
 	<script>
 	$(function() {
 		$( "#tabs" ).tabs({
-			ajaxOptions: {
-				error: function( xhr, status, index, anchor ) {
-					var selector = $( anchor ).attr( "aria-controls" );
-					$( selector ).html(
+			beforeLoad: function( event, ui ) {
+				ui.jqXHR.error(function() {
+					ui.panel.html(
 						"Couldn't load this tab. We'll try to fix this as soon as possible. " +
 						"If this wouldn't be a demo." );
-				}
+				});
 			}
 		});
 	});

diff --git a/demos/tabs/bottom.html b/demos/tabs/bottom.html
@@ -23,7 +23,6 @@
 	.tabs-bottom .ui-tabs-panel { height: 140px; overflow: auto; } 
 	.tabs-bottom .ui-tabs-nav { position: absolute !important; left: 0; bottom: 0; right:0; padding: 0 0.2em 0.2em 0; } 
 	.tabs-bottom .ui-tabs-nav li { margin-top: -2px !important; margin-bottom: 1px !important; border-top: none; border-bottom-width: 1px; }
-	.ui-tabs-selected { margin-top: -3px !important; }
 	</style>
 </head>
 <body>

diff --git a/demos/tabs/sortable.html b/demos/tabs/sortable.html
@@ -13,7 +13,13 @@
 	<link rel="stylesheet" href="../demos.css">
 	<script>
 	$(function() {
-		$( "#tabs" ).tabs().find( ".ui-tabs-nav" ).sortable({ axis: "x" });
+		var tabs = $( "#tabs" ).tabs();
+		tabs.find( ".ui-tabs-nav" ).sortable({
+			axis: "x",
+			stop: function() {
+				tabs.tabs( "refresh" );
+			}
+		});
 	});
 	</script>
 </head>

diff --git a/demos/tabs/vertical.html b/demos/tabs/vertical.html
@@ -20,7 +20,7 @@
 	.ui-tabs-vertical .ui-tabs-nav { padding: .2em .1em .2em .2em; float: left; width: 12em; }
 	.ui-tabs-vertical .ui-tabs-nav li { clear: left; width: 100%; border-bottom-width: 1px !important; border-right-width: 0 !important; margin: 0 -1px .2em 0; }
 	.ui-tabs-vertical .ui-tabs-nav li a { display:block; }
-	.ui-tabs-vertical .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 0; padding-right: .1em; border-right-width: 1px; border-right-width: 1px; }
+	.ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active { padding-bottom: 0; padding-right: .1em; border-right-width: 1px; border-right-width: 1px; }
 	.ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: right; width: 40em;}
 	</style>
 </head>

diff --git a/demos/tooltip/custom-animation.html b/demos/tooltip/custom-animation.html
@@ -11,12 +11,15 @@
 	<link type="text/css" href="../demos.css" rel="stylesheet" />
 	<script type="text/javascript">
 	$(function() {
+		// TODO overhaul this with custom animation API
 		$(".demo").tooltip({
 			open: function() {
-				$(this).tooltip("widget").stop(false, true).hide().slideDown();
+				$(".ui-tooltip").stop(false, true).hide().slideDown();
 			},
 			close: function() {
-				$(this).tooltip("widget").stop(false, true).show().slideUp();
+				$(".ui-tooltip").stop(false, false).show().slideUp(function() {
+					$(this).remove();
+				});
 			}
 		});
 	});

diff --git a/demos/tooltip/index.html b/demos/tooltip/index.html
@@ -14,6 +14,7 @@ <h4>Examples</h4>
 		<li><a href="tracking.html">Track the mouse</a></li>
 		<li><a href="custom-animation.html">Custom animation</a></li>
 		<li><a href="delegation-mixbag.html">Delegation Mixbag</a></li>
+		<li><a href="lots.html">Lots</a></li>
 	</ul>
 </div>
 

diff --git a/demos/tooltip/tracking.html b/demos/tooltip/tracking.html
@@ -13,20 +13,19 @@
 	$(function() {
 		$(".demo").tooltip({
 			open: function() {
-				var tooltip = $(this).tooltip("widget");
-				$(document).mousemove(function(event) {
-					tooltip.position({
-						my: "left center",
-						at: "right center",
-						offset: "25 25",
+				var tooltip = $( ".ui-tooltip" );
+				$(document).mousemove(function( event ) {
+					tooltip.position( {
+						my: "left+25 center",
+						at: "right+25 center",
 						of: event
 					});
 				})
 				// trigger once to override element-relative positioning
 				.mousemove();
 			},
 			close: function() {
-				$(document).unbind("mousemove");
+				$(document).unbind( "mousemove" );
 			}
 		});
 	});

diff --git a/tests/static/menu/all-menus-icons.html b/tests/static/menu/all-menus-icons.html
diff --git a/tests/static/menu/default.html b/tests/static/menu/default.html
diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html
@@ -20,7 +20,7 @@
 	<script src="../testsuite.js"></script>
 
 	<script>
-	function state( accordion ) {
+	function accordion_state( accordion ) {
 		var expected = $.makeArray( arguments ).slice( 1 );
 		var actual = accordion.find( ".ui-accordion-content" ).map(function() {
 			return $( this ).css( "display" ) === "none" ? 0 : 1;