Merge branch 'master' into selectmenu

jquery · Jan 2, 2013 · 1ba02e9 · 1ba02e9
2 parents 2eb9223 + 18b8ffd
commit 1ba02e9
Show file tree

Hide file tree

Showing 61 changed files with 2,966 additions and 2,984 deletions.
diff --git a/demos/tabs/manipulation.html b/demos/tabs/manipulation.html
@@ -24,7 +24,7 @@
 	$(function() {
 		var tabTitle = $( "#tab_title" ),
 			tabContent = $( "#tab_content" ),
-			tabTemplate = "<li><a href='#{href}'>#{label}</a> <span class='ui-icon ui-icon-close'>Remove Tab</span></li>",
+			tabTemplate = "<li><a href='#{href}'>#{label}</a> <span class='ui-icon ui-icon-close' role='presentation'>Remove Tab</span></li>",
 			tabCounter = 2;
 
 		var tabs = $( "#tabs" ).tabs();
@@ -75,11 +75,19 @@
 			});
 
 		// close icon: removing the tab on click
-		$( "#tabs span.ui-icon-close" ).live( "click", function() {
+		tabs.delegate( "span.ui-icon-close", "click", function() {
 			var panelId = $( this ).closest( "li" ).remove().attr( "aria-controls" );
 			$( "#" + panelId ).remove();
 			tabs.tabs( "refresh" );
 		});
+
+		tabs.bind( "keyup", function( event ) {
+			if ( event.altKey && event.keyCode === $.ui.keyCode.BACKSPACE ) {
+				var panelId = tabs.find( ".ui-tabs-active" ).remove().attr( "aria-controls" );
+				$( "#" + panelId ).remove();
+				tabs.tabs( "refresh" );
+			}
+		});
 	});
 	</script>
 </head>
@@ -100,7 +108,7 @@
 
 <div id="tabs">
 	<ul>
-		<li><a href="#tabs-1">Nunc tincidunt</a> <span class="ui-icon ui-icon-close">Remove Tab</span></li>
+		<li><a href="#tabs-1">Nunc tincidunt</a> <span class="ui-icon ui-icon-close" role="presentation">Remove Tab</span></li>
 	</ul>
 	<div id="tabs-1">
 		<p>Proin elit arcu, rutrum commodo, vehicula tempus, commodo a, risus. Curabitur nec arcu. Donec sollicitudin mi sit amet mauris. Nam elementum quam ullamcorper ante. Etiam aliquet massa et lorem. Mauris dapibus lacus auctor risus. Aenean tempor ullamcorper leo. Vivamus sed magna quis ligula eleifend adipiscing. Duis orci. Aliquam sodales tortor vitae ipsum. Aliquam nulla. Duis aliquam molestie erat. Ut et mauris vel pede varius sollicitudin. Sed ut dolor nec orci tincidunt interdum. Phasellus ipsum. Nunc tristique tempus lectus.</p>

diff --git a/tests/.jshintrc b/tests/.jshintrc
@@ -9,6 +9,7 @@
 	"latedef": true,
 	"noarg": true,
 	"onevar": true,
+	"quotmark": "double",
 	"trailing": true,
 	"undef": true,
 	"unused": true,

diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html
@@ -35,6 +35,10 @@
 		font-size: 12px;
 		line-height: 15px;
 	}
+	/* avoid IE7 oscillating between overflow visible and scroll values */
+	#list1 > div {
+		overflow: visible;
+	}
 	</style>
 </head>
 <body>

diff --git a/tests/unit/button/button.html b/tests/unit/button/button.html
@@ -25,7 +25,6 @@
 	<script src="button_events.js"></script>
 	<script src="button_methods.js"></script>
 	<script src="button_options.js"></script>
-	<script src="button_tickets.js"></script>
 
 	<script src="../swarminject.js"></script>
 </head>