Merge branch 'master' into selectmenu

jquery · Mar 1, 2012 · b4d9eee · b4d9eee
2 parents 8c10c1e + 63215a6
commit b4d9eee
Show file tree

Hide file tree

Showing 95 changed files with 2,121 additions and 1,889 deletions.
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
@@ -73,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
@@ -82,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
@@ -91,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.
@@ -105,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
@@ -39,19 +39,19 @@
 
 <div id="accordion">
 	<div class="group">
-		<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>
 	</div>
 	<div class="group">
-		<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>
 	</div>
 	<div class="group">
-		<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>
@@ -62,7 +62,7 @@ <h3><a href="#">Section 3</a></h3>
 		</div>
 	</div>
 	<div class="group">
-		<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/position/cycler.html b/demos/position/cycler.html
@@ -17,6 +17,7 @@
     </style>
 	<script>
 	$(function() {
+		// TODO refactor into a widget and get rid of these plugin methods
 		$.fn.position2 = function( options ) {
 			return this.position( $.extend({
 				of: window,
@@ -52,10 +53,6 @@
 			});
 		};
 
-		$( "img:eq(0)" ).left();
-		$( "img:eq(1)" ).center();
-		$( "img:eq(2)" ).right();
-
 		$( "body" ).css({
 			overflow: "hidden"
 		})
@@ -66,24 +63,30 @@
 			position: "absolute",
 		});
 
+		$( "img:eq(0)" ).left();
+		$( "img:eq(1)" ).center();
+		$( "img:eq(2)" ).right();
+
 		function animate( to ) {
-			$(this).animate( to );
+			$(this).stop( true, false ).animate( to );
 		}
-		function next() {
+		function next( event ) {
+			event.preventDefault();
 			$( "img:eq(2)" ).center( animate );
 			$( "img:eq(1)" ).left( animate )
 			$( "img:eq(0)" ).right().appendTo( ".demo" );
 		}
-		function previous() {
+		function previous( event ) {
+			event.preventDefault();
 			$( "img:eq(0)" ).center( animate );
 			$( "img:eq(1)" ).right( animate );
 			$( "img:eq(2)" ).left().prependTo( ".demo" );
 		}
 		$( "#previous" ).click( previous );
 		$( "#next" ).click( next );
 
-		$( ".demo img" ).click(function() {
-			$( ".demo img" ).index( this ) === 0 ? previous() : next();
+		$( ".demo img" ).click(function( event ) {
+			$( ".demo img" ).index( this ) === 0 ? previous( event ) : next( event );
 		});
 
 		$( window ).resize(function() {
@@ -98,9 +101,9 @@
 
 <div class="demo">
 
-<img src="images/earth.jpg" />
-<img src="images/flight.jpg" />
-<img src="images/rocket.jpg" />
+<img src="images/earth.jpg" width="458" height="308" />
+<img src="images/flight.jpg" width="512" height="307" />
+<img src="images/rocket.jpg" width="300" height="353" />
 
 <a id="previous" href="#">Previous</a>
 <a id="next" href="#">Next</a>

diff --git a/external/qunit.css b/external/qunit.css
@@ -1,9 +1,9 @@
 /**
- * QUnit - A JavaScript Unit Testing Framework
+ * QUnit v1.4.0pre - A JavaScript Unit Testing Framework
  *
  * http://docs.jquery.com/QUnit
  *
- * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Copyright (c) 2012 John Resig, Jörn Zaefferer
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * or GPL (GPL-LICENSE.txt) licenses.
  */
@@ -54,6 +54,10 @@
 	color: #fff;
 }
 
+#qunit-header label {
+	display: inline-block;
+}
+
 #qunit-banner {
 	height: 5px;
 }
@@ -186,6 +190,7 @@
 	color: #710909;
 	background-color: #fff;
 	border-left: 26px solid #EE5757;
+	white-space: pre;
 }
 
 #qunit-tests > li:last-child {
@@ -222,4 +227,6 @@
 	position: absolute;
 	top: -10000px;
 	left: -10000px;
+	width: 1000px;
+	height: 1000px;
 }