Merge branch 'master' into grid

Conflicts: demos/menubar/default.html
ghiculescu · Mar 14, 2012 · 7608f44 · 7608f44
2 parents e4084c4 + ec062c1
commit 7608f44
Show file tree

Hide file tree

Showing 186 changed files with 3,911 additions and 7,606 deletions.
diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2011 Paul Bakaus, http://jqueryui.com/
+Copyright (c) 2012 Paul Bakaus, http://jqueryui.com/
 
 This software consists of voluntary contributions made by many
 individuals (AUTHORS.txt, http://jqueryui.com/about) For exact

diff --git a/build/build.xml b/build/build.xml
@@ -123,6 +123,12 @@
 				<mapper type="glob" from="*.js" to="${min.dir}/*.min.js" />
 				<targetfile/>
 			</apply>
+			<apply executable="build/minify-js.sh">
+				<fileset dir="${dist.dir}/ui/i18n" includes="**.js" />
+				<srcfile />
+				<mapper type="glob" from="*.js" to="${min.dir}/i18n/*.min.js" />
+				<targetfile/>
+			</apply>
 			<apply executable="java" parallel="false">
 				<fileset dir="${dist.dir}/themes/base" includes="*.css" />
 				<arg line="-jar" />

diff --git a/demos/accordion/collapsible.html b/demos/accordion/collapsible.html
@@ -22,15 +22,15 @@
 <div class="demo">
 
 <div id="accordion">
-	<h3><a href="#">Section 1</a></h3>
+	<h3>Section 1</h3>
 	<div>
 		<p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
 	</div>
-	<h3><a href="#">Section 2</a></h3>
+	<h3>Section 2</h3>
 	<div>
 		<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
 	</div>
-	<h3><a href="#">Section 3</a></h3>
+	<h3>Section 3</h3>
 	<div>
 		<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
 		<ul>
@@ -39,7 +39,7 @@ <h3><a href="#">Section 3</a></h3>
 			<li>List item three</li>
 		</ul>
 	</div>
-	<h3><a href="#">Section 4</a></h3>
+	<h3>Section 4</h3>
 	<div>
 		<p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
 	</div>

diff --git a/demos/accordion/custom-icons.html b/demos/accordion/custom-icons.html
@@ -32,15 +32,15 @@
 <div class="demo">
 
 <div id="accordion">
-	<h3><a href="#">Section 1</a></h3>
+	<h3>Section 1</h3>
 	<div>
 		<p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
 	</div>
-	<h3><a href="#">Section 2</a></h3>
+	<h3>Section 2</h3>
 	<div>
 		<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
 	</div>
-	<h3><a href="#">Section 3</a></h3>
+	<h3>Section 3</h3>
 	<div>
 		<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
 		<ul>
@@ -49,7 +49,7 @@ <h3><a href="#">Section 3</a></h3>
 			<li>List item three</li>
 		</ul>
 	</div>
-	<h3><a href="#">Section 4</a></h3>
+	<h3>Section 4</h3>
 	<div>
 		<p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
 	</div>

diff --git a/demos/accordion/default.html b/demos/accordion/default.html
@@ -20,7 +20,7 @@
 <div class="demo">
 
 <div id="accordion">
-	<h3><a href="#">Section 1</a></h3>
+	<h3>Section 1</h3>
 	<div>
 		<p>
 		Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer
@@ -29,7 +29,7 @@ <h3><a href="#">Section 1</a></h3>
 		odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.
 		</p>
 	</div>
-	<h3><a href="#">Section 2</a></h3>
+	<h3>Section 2</h3>
 	<div>
 		<p>
 		Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet
@@ -38,7 +38,7 @@ <h3><a href="#">Section 2</a></h3>
 		suscipit faucibus urna.
 		</p>
 	</div>
-	<h3><a href="#">Section 3</a></h3>
+	<h3>Section 3</h3>
 	<div>
 		<p>
 		Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis.
@@ -52,7 +52,7 @@ <h3><a href="#">Section 3</a></h3>
 			<li>List item three</li>
 		</ul>
 	</div>
-	<h3><a href="#">Section 4</a></h3>
+	<h3>Section 4</h3>
 	<div>
 		<p>
 		Cras dictum. Pellentesque habitant morbi tristique senectus et netus

diff --git a/demos/accordion/fillspace.html b/demos/accordion/fillspace.html
@@ -37,15 +37,15 @@ <h3 class="docs">Resize the outer container:</h3>
 <div id="accordionResizer" style="padding:10px; width:350px; height:220px;" class="ui-widget-content">
 
 <div id="accordion">
-	<h3><a href="#">Section 1</a></h3>
+	<h3>Section 1</h3>
 	<div>
 		<p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
 	</div>
-	<h3><a href="#">Section 2</a></h3>
+	<h3>Section 2</h3>
 	<div>
 		<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
 	</div>
-	<h3><a href="#">Section 3</a></h3>
+	<h3>Section 3</h3>
 	<div>
 		<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
 		<ul>
@@ -54,7 +54,7 @@ <h3><a href="#">Section 3</a></h3>
 			<li>List item three</li>
 		</ul>
 	</div>
-	<h3><a href="#">Section 4</a></h3>
+	<h3>Section 4</h3>
 	<div>
 		<p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
 	</div>

diff --git a/demos/accordion/hoverintent.html b/demos/accordion/hoverintent.html
@@ -29,7 +29,7 @@
 			$( this ).unbind( "mouseover", jQuery.event.special.hoverintent.handler );
 		},
 		handler: function( event ) {
-			var self = this,
+			var that = this,
 				args = arguments,
 				target = $( event.target ),
 				cX, cY, pX, pY;
@@ -50,7 +50,11 @@
 				if ( ( Math.abs( pX - cX ) + Math.abs( pY - cY ) ) < cfg.sensitivity ) {
 					clear();
 					event.type = "hoverintent";
-					jQuery.event.handle.apply( self, args );
+					// prevent accessing the original event since the new event
+					// is fired asynchronously and the old event is no longer
+					// usable (#6028)
+					event.originalEvent = {};
+					jQuery.event.handle.apply( that, args );
 				} else {
 					pX = cX;
 					pY = cY;
@@ -69,7 +73,7 @@
 <div class="demo">
 
 <div id="accordion">
-	<h3><a href="#">Section 1</a></h3>
+	<h3>Section 1</h3>
 	<div>
 		<p>
 		Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer
@@ -78,7 +82,7 @@ <h3><a href="#">Section 1</a></h3>
 		odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.
 		</p>
 	</div>
-	<h3><a href="#">Section 2</a></h3>
+	<h3>Section 2</h3>
 	<div>
 		<p>
 		Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet
@@ -87,7 +91,7 @@ <h3><a href="#">Section 2</a></h3>
 		suscipit faucibus urna.
 		</p>
 	</div>
-	<h3><a href="#">Section 3</a></h3>
+	<h3>Section 3</h3>
 	<div>
 		<p>
 		Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis.
@@ -101,7 +105,7 @@ <h3><a href="#">Section 3</a></h3>
 			<li>List item three</li>
 		</ul>
 	</div>
-	<h3><a href="#">Section 4</a></h3>
+	<h3>Section 4</h3>
 	<div>
 		<p>
 		Cras dictum. Pellentesque habitant morbi tristique senectus et netus

diff --git a/demos/accordion/index.html b/demos/accordion/index.html
@@ -14,7 +14,6 @@ <h4>Examples</h4>
 		<li><a href="fillspace.html">Fill space</a></li>
 		<li><a href="no-auto-height.html">No auto height</a></li>
 		<li><a href="collapsible.html">Collapse content</a></li>
-		<li><a href="mouseover.html">Open on mouseover</a></li>
 		<li><a href="hoverintent.html">Open on hoverintent</a></li>
 		<li><a href="custom-icons.html">Customize icons</a></li>
 		<li><a href="sortable.html">Sortable</a></li>

diff --git a/demos/accordion/mouseover.html b/demos/accordion/mouseover.html
diff --git a/demos/accordion/no-auto-height.html b/demos/accordion/no-auto-height.html
@@ -22,15 +22,15 @@
 <div class="demo">
 
 <div id="accordion">
-	<h3><a href="#section1">Section 1</a></h3>
+	<h3>Section 1</h3>
 	<div>
 		<p>Mauris mauris ante, blandit et, ultrices a, susceros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
 	</div>
-	<h3><a href="#section2">Section 2</a></h3>
+	<h3>Section 2</h3>
 	<div>
 		<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
 	</div>
-	<h3><a href="#section3">Section 3</a></h3>
+	<h3>Section 3</h3>
 	<div>
 		<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
 		<ul>
@@ -42,7 +42,6 @@ <h3><a href="#section3">Section 3</a></h3>
 			<li>List item</li>
 			<li>List item</li>
 		</ul>
-		<a href="#othercontent">Link to other content</a>
 	</div>
 </div>
 

diff --git a/demos/accordion/sortable.html b/demos/accordion/sortable.html
@@ -11,25 +11,23 @@
 	<script src="../../ui/jquery.ui.sortable.js"></script>
 	<script src="../../ui/jquery.ui.accordion.js"></script>
 	<link rel="stylesheet" href="../demos.css">
+	<style>
+	/* IE has layout issues when sorting (see #5413) */
+	.group { zoom: 1 }
+	</style>
 	<script>
 	$(function() {
-		var stop = false;
-		$( "#accordion h3" ).click(function( event ) {
-			if ( stop ) {
-				event.stopImmediatePropagation();
-				event.preventDefault();
-				stop = false;
-			}
-		});
 		$( "#accordion" )
 			.accordion({
 				header: "> div > h3"
 			})
 			.sortable({
 				axis: "y",
 				handle: "h3",
-				stop: function() {
-					stop = true;
+				stop: function( event, ui ) {
+					// IE doesn't register the blur when sorting
+					// so trigger focusout handlers to remove .ui-state-focus
+					ui.item.children( "h3" ).triggerHandler( "focusout" );
 				}
 			});
 	});
@@ -40,20 +38,20 @@
 <div class="demo">
 
 <div id="accordion">
-	<div>
-		<h3><a href="#">Section 1</a></h3>
+	<div class="group">
+		<h3>Section 1</h3>
 		<div>
 			<p>Mauris mauris ante, blandit et, ultrices a, suscipit eget, quam. Integer ut neque. Vivamus nisi metus, molestie vel, gravida in, condimentum sit amet, nunc. Nam a nibh. Donec suscipit eros. Nam mi. Proin viverra leo ut odio. Curabitur malesuada. Vestibulum a velit eu ante scelerisque vulputate.</p>
 		</div>
 	</div>
-	<div>
-		<h3><a href="#">Section 2</a></h3>
+	<div class="group">
+		<h3>Section 2</h3>
 		<div>
 			<p>Sed non urna. Donec et ante. Phasellus eu ligula. Vestibulum sit amet purus. Vivamus hendrerit, dolor at aliquet laoreet, mauris turpis porttitor velit, faucibus interdum tellus libero ac justo. Vivamus non quam. In suscipit faucibus urna. </p>
 		</div>
 	</div>
-	<div>
-		<h3><a href="#">Section 3</a></h3>
+	<div class="group">
+		<h3>Section 3</h3>
 		<div>
 			<p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>
 			<ul>
@@ -63,8 +61,8 @@ <h3><a href="#">Section 3</a></h3>
 			</ul>
 		</div>
 	</div>
-	<div>
-		<h3><a href="#">Section 4</a></h3>
+	<div class="group">
+		<h3>Section 4</h3>
 		<div>
 			<p>Cras dictum. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia mauris vel est. </p><p>Suspendisse eu nisl. Nullam ut libero. Integer dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
 		</div>

diff --git a/demos/addClass/default.html b/demos/addClass/default.html
@@ -33,7 +33,7 @@
 <div class="demo">
 
 <div class="toggler">
-	<div id="effect" class=" ui-corner-all">
+	<div id="effect" class="ui-corner-all">
 			Etiam libero neque, luctus a, eleifend nec, semper at, lorem. Sed pede.
 	</div>
 </div>

diff --git a/demos/autocomplete/categories.html b/demos/autocomplete/categories.html
@@ -22,14 +22,14 @@
 	<script>
 	$.widget( "custom.catcomplete", $.ui.autocomplete, {
 		_renderMenu: function( ul, items ) {
-			var self = this,
+			var that = this,
 				currentCategory = "";
 			$.each( items, function( index, item ) {
 				if ( item.category != currentCategory ) {
 					ul.append( "<li class='ui-autocomplete-category'>" + item.category + "</li>" );
 					currentCategory = item.category;
 				}
-				self._renderItem( ul, item );
+				that._renderItem( ul, item );
 			});
 		}
 	});