Merge branch 'master' of https://github.com/jquery/jquery-ui into

split
jstroem · Jul 23, 2011 · 675b105 · 675b105
2 parents 5c464cc + 51ee3be
commit 675b105
Show file tree

Hide file tree

Showing 246 changed files with 10,302 additions and 6,027 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ docs
 *.diff
 *.patch
 .DS_Store
+.settings
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -17,6 +17,7 @@ Bohdan Ganicky
 Scott González
 Marc Grabanski (m@marcgrabanski.com)
 Klaus Hartl (stilbuero.de)
+Hans Hillen (TPG, funded through AEGIS: http://www.aegis-project.eu/)
 Scott Jehl
 Cody Lindley
 Eduardo Lundgren (eduardolundgren@gmail.com)

diff --git a/README.md b/README.md
@@ -7,3 +7,32 @@ If you want to use jQuery UI, go to [jqueryui.com](http://jqueryui.com) to get s
 
 If you are interested in helping developing jQuery UI, you are in the right place.
 To discuss development with team members and the community, visit the [Developing jQuery UI Forum](http://forum.jquery.com/developing-jquery-ui).
+
+For contributors
+---
+If you want to help and provide a patch for a bugfix or new feature, please take
+a few minutes and look at [our Getting Involved guide](http://wiki.jqueryui.com/w/page/35263114/Getting-Involved),
+in particular check out the [Coding standards](http://wiki.jqueryui.com/w/page/12137737/Coding-standards)
+and [Commit Message Style Guide](http://wiki.jqueryui.com/w/page/25941597/Commit-Message-Style-Guide).
+
+In general, fork the project, create a branch for a specific change and send a
+pull request for that branch. Don't mix unrelated changes. You can use the commit
+message as the description for the pull request.
+
+
+For committers
+---
+When looking at pull requests, first check for [proper commit messages](http://wiki.jqueryui.com/w/page/12137724/Bug-Fixing-Guide).
+
+Unless everything is fine and you can merge directly via GitHub's interface, fetch the remote first:
+
+    git remote add [username] [his-fork.git] -f
+
+If you want just one commit and edit the commit message:
+
+    git cherry-pick -e [sha-of-commit]
+
+If it should go to the stable brach, cherry-pick it to stable:
+
+    git checkout 1-8-stable
+    git cherry-pick -x [sha-of-commit]
diff --git a/build/build.xml b/build/build.xml
@@ -160,42 +160,46 @@
 		<mkdir dir="${min.dir}" />
 		<mkdir dir="${min.dir}/i18n/" />
 		<mkdir dir="${dist.dir}/themes/base/minified" />
-
-		<apply executable="java" parallel="false">
-			<fileset dir="${dist.dir}/ui" includes="*.js" />
-			<arg line="-jar" />
-			<arg path="${closure-jar}" />
-			<arg value="--warning_level" />
-			<arg value="QUIET" />
-			<arg value="--js_output_file" />
-			<targetfile />
-			<arg value="--js" />
-			<mapper type="glob" from="*.js" to="${min.dir}/*.min.js" />
-		</apply>
-
-		<apply executable="java" parallel="false">
-			<fileset dir="${dist.dir}/ui/i18n" includes="*.js" />
-			<arg line="-jar" />
-			<arg path="${closure-jar}" />
-			<arg value="--warning_level" />
-			<arg value="QUIET" />
-			<arg value="--js_output_file" />
-			<targetfile />
-			<arg value="--js" />
-			<mapper type="glob" from="*.js" to="${min.dir}/i18n/*.min.js" />
-		</apply>
-
-		<apply executable="java" parallel="false">
-			<fileset dir="${dist.dir}/themes/base" includes="*.css" />
-			<arg line="-jar" />
-			<arg path="${yuicompressor-jar}" />
-			<arg line="--charset utf-8" />
-			<arg line="-v" />
-			<srcfile />
-			<arg line="-o" />
-			<mapper type="glob" from="*.css" to="${dist.dir}/themes/base/minified/*.min.css" />
-			<targetfile/>
-		</apply>
+
+        <parallel threadsperprocessor="1">
+
+            <apply executable="java" parallel="false">
+                <fileset dir="${dist.dir}/ui" includes="*.js" />
+                <arg line="-jar" />
+                <arg path="${closure-jar}" />
+                <arg value="--warning_level" />
+                <arg value="QUIET" />
+                <arg value="--js_output_file" />
+                <targetfile />
+                <arg value="--js" />
+                <mapper type="glob" from="*.js" to="${min.dir}/*.min.js" />
+            </apply>
+
+            <apply executable="java" parallel="false">
+                <fileset dir="${dist.dir}/ui/i18n" includes="*.js" />
+                <arg line="-jar" />
+                <arg path="${closure-jar}" />
+                <arg value="--warning_level" />
+                <arg value="QUIET" />
+                <arg value="--js_output_file" />
+                <targetfile />
+                <arg value="--js" />
+                <mapper type="glob" from="*.js" to="${min.dir}/i18n/*.min.js" />
+            </apply>
+
+            <apply executable="java" parallel="false">
+                <fileset dir="${dist.dir}/themes/base" includes="*.css" />
+                <arg line="-jar" />
+                <arg path="${yuicompressor-jar}" />
+                <arg line="--charset utf-8" />
+                <arg line="-v" />
+                <srcfile />
+                <arg line="-o" />
+                <mapper type="glob" from="*.css" to="${dist.dir}/themes/base/minified/*.min.css" />
+                <targetfile/>
+            </apply>
+
+        </parallel>
 
 		<replaceregexp match=".css" replace=".min.css" flags="g">
 			<fileset dir="${dist.dir}/themes/base/minified/">
@@ -258,53 +262,56 @@
 		<mkdir dir="${docs.dir}" />
 		<property name="url" value="http://docs.jquery.com/action/render/UI/API/${release.version}/" />
 
-		<get src="${url}Draggable" dest="${docs.dir}draggable.html" />
-		<get src="${url}Droppable" dest="${docs.dir}droppable.html" />
-		<get src="${url}Resizable" dest="${docs.dir}resizable.html" />
-		<get src="${url}Selectable" dest="${docs.dir}selectable.html" />
-		<get src="${url}Sortable" dest="${docs.dir}sortable.html" />
-
-		<get src="${url}Accordion" dest="${docs.dir}accordion.html" />
-		<get src="${url}Autocomplete" dest="${docs.dir}autocomplete.html" />
-		<get src="${url}Button" dest="${docs.dir}button.html" />
-		<get src="${url}Datepicker" dest="${docs.dir}datepicker.html" />
-		<get src="${url}Dialog" dest="${docs.dir}dialog.html" />
-		<get src="${url}Menu" dest="${docs.dir}menu.html" />
-		<get src="${url}Progressbar" dest="${docs.dir}progressbar.html" />
-		<get src="${url}Slider" dest="${docs.dir}slider.html" />
-		<get src="${url}Spinner" dest="${docs.dir}spinner.html" />
-		<get src="${url}Tooltip" dest="${docs.dir}tooltip.html" />
-		<get src="${url}Tabs" dest="${docs.dir}tabs.html" />
-
-		<get src="${url}Position" dest="${docs.dir}position.html" />
-
-		<get src="http://docs.jquery.com/action/render/UI/Effects/animate" dest="${docs.dir}animate.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/addClass" dest="${docs.dir}addClass.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/effect" dest="${docs.dir}effect.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/hide" dest="${docs.dir}hide.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/removeClass" dest="${docs.dir}removeClass.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/show" dest="${docs.dir}show.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/switchClass" dest="${docs.dir}switchClass.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/toggle" dest="${docs.dir}toggle.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/toggleClass" dest="${docs.dir}toggleClass.html" />
-
-
-		<get src="http://docs.jquery.com/action/render/UI/Effects/Blind" dest="${docs.dir}effect-blind.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/Clip" dest="${docs.dir}effect-clip.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/Drop" dest="${docs.dir}effect-drop.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/Explode" dest="${docs.dir}effect-explode.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/Fade" dest="${docs.dir}effect-fade.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/Fold" dest="${docs.dir}effect-fold.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/Puff" dest="${docs.dir}effect-puff.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/Slide" dest="${docs.dir}effect-slide.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/Scale" dest="${docs.dir}effect-scale.html" />
-
-		<get src="http://docs.jquery.com/action/render/UI/Effects/Bounce" dest="${docs.dir}effect-bounce.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/Highlight" dest="${docs.dir}effect-highlight.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/Pulsate" dest="${docs.dir}effect-pulsate.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/Shake" dest="${docs.dir}effect-shake.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/Size" dest="${docs.dir}effect-size.html" />
-		<get src="http://docs.jquery.com/action/render/UI/Effects/Transfer" dest="${docs.dir}effect-transfer.html" />
+        <parallel threadcount="8">
+
+            <get src="${url}Draggable" dest="${docs.dir}draggable.html" />
+            <get src="${url}Droppable" dest="${docs.dir}droppable.html" />
+            <get src="${url}Resizable" dest="${docs.dir}resizable.html" />
+            <get src="${url}Selectable" dest="${docs.dir}selectable.html" />
+            <get src="${url}Sortable" dest="${docs.dir}sortable.html" />
+
+            <get src="${url}Accordion" dest="${docs.dir}accordion.html" />
+            <get src="${url}Autocomplete" dest="${docs.dir}autocomplete.html" />
+            <get src="${url}Button" dest="${docs.dir}button.html" />
+            <get src="${url}Datepicker" dest="${docs.dir}datepicker.html" />
+            <get src="${url}Dialog" dest="${docs.dir}dialog.html" />
+            <get src="${url}Menu" dest="${docs.dir}menu.html" />
+            <get src="${url}Progressbar" dest="${docs.dir}progressbar.html" />
+            <get src="${url}Slider" dest="${docs.dir}slider.html" />
+            <get src="${url}Spinner" dest="${docs.dir}spinner.html" />
+            <get src="${url}Tooltip" dest="${docs.dir}tooltip.html" />
+            <get src="${url}Tabs" dest="${docs.dir}tabs.html" />
+
+            <get src="${url}Position" dest="${docs.dir}position.html" />
+
+            <get src="http://docs.jquery.com/action/render/UI/Effects/animate" dest="${docs.dir}animate.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/addClass" dest="${docs.dir}addClass.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/effect" dest="${docs.dir}effect.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/hide" dest="${docs.dir}hide.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/removeClass" dest="${docs.dir}removeClass.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/show" dest="${docs.dir}show.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/switchClass" dest="${docs.dir}switchClass.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/toggle" dest="${docs.dir}toggle.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/toggleClass" dest="${docs.dir}toggleClass.html" />
+
+
+            <get src="http://docs.jquery.com/action/render/UI/Effects/Blind" dest="${docs.dir}effect-blind.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/Clip" dest="${docs.dir}effect-clip.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/Drop" dest="${docs.dir}effect-drop.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/Explode" dest="${docs.dir}effect-explode.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/Fade" dest="${docs.dir}effect-fade.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/Fold" dest="${docs.dir}effect-fold.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/Puff" dest="${docs.dir}effect-puff.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/Slide" dest="${docs.dir}effect-slide.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/Scale" dest="${docs.dir}effect-scale.html" />
+
+            <get src="http://docs.jquery.com/action/render/UI/Effects/Bounce" dest="${docs.dir}effect-bounce.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/Highlight" dest="${docs.dir}effect-highlight.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/Pulsate" dest="${docs.dir}effect-pulsate.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/Shake" dest="${docs.dir}effect-shake.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/Size" dest="${docs.dir}effect-size.html" />
+            <get src="http://docs.jquery.com/action/render/UI/Effects/Transfer" dest="${docs.dir}effect-transfer.html" />
+        </parallel>
 	</target>
 
 	<target name="themes-download">

diff --git a/build/release/prepare-release b/build/release/prepare-release
diff --git a/demos/autocomplete/categories.html b/demos/autocomplete/categories.html
@@ -47,7 +47,7 @@
 			{ label: "andreas andersson", category: "People" },
 			{ label: "andreas johnson", category: "People" }
 		];
-		
+
 		$( "#search" ).catcomplete({
 			delay: 0,
 			source: data
@@ -59,7 +59,7 @@
 
 <div class="demo">
 	<label for="search">Search: </label>
-	<input id="search" />
+	<input id="search">
 </div><!-- End demo -->
 
 

diff --git a/demos/autocomplete/combobox.html b/demos/autocomplete/combobox.html
@@ -14,9 +14,16 @@
 	<script src="../../ui/jquery.ui.tooltip.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
-	.ui-button { margin-left: -1px; }
-	.ui-button-icon-only .ui-button-text { padding: 0.35em; } 
-	.ui-autocomplete-input { margin: 0; padding: 0.48em 0 0.47em 0.45em; }
+	.ui-button {
+		margin-left: -1px;
+	}
+	.ui-button-icon-only .ui-button-text {
+		padding: 0.35em;
+	} 
+	.ui-autocomplete-input {
+		margin: 0;
+		padding: 0.4em 0 0.4em 0.45em;
+	}
 	</style>
 	<script>
 	(function( $ ) {
@@ -26,6 +33,32 @@
 					select = this.element.hide(),
 					selected = select.children( ":selected" ),
 					value = selected.val() ? selected.text() : "";
+
+				function removeIfInvalid(element) {
+					var value = $( element ).val(),
+						matcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( value ) + "$", "i" ),
+						valid = false;
+					select.children( "option" ).each(function() {
+						if ( $( this ).text().match( matcher ) ) {
+							this.selected = valid = true;
+							return false;
+						}
+					});
+					if ( !valid ) {
+						// remove invalid value, as it didn't match anything
+						$( element )
+							.val( "" )
+							.attr( "title", value + " didn't match any item" )
+							.tooltip( "open" );
+						select.val( "" );
+						setTimeout(function() {
+							input.tooltip( "close" ).attr( "title", "" );
+						}, 2500 );
+						input.data( "autocomplete" ).term = "";
+						return false;
+					}
+				}
+
 				var input = this.input = $( "<input>" )
 					.insertAfter( select )
 					.val( value )
@@ -57,36 +90,14 @@
 							});
 						},
 						change: function( event, ui ) {
-							if ( !ui.item ) {
-								var value = $( this ).val(),
-									matcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( value ) + "$", "i" ),
-									valid = false;
-								select.children( "option" ).each(function() {
-									if ( $( this ).text().match( matcher ) ) {
-										this.selected = valid = true;
-										return false;
-									}
-								});
-								if ( !valid ) {
-									// remove invalid value, as it didn't match anything
-									$( this )
-										.val( "" )
-										.attr( "title", value + " didn't match any item" )
-										.tooltip( "open" );
-									select.val( "" );
-									setTimeout(function() {
-										input.tooltip( "close" ).attr( "title", "" );
-									}, 2500 );
-									input.data( "autocomplete" ).term = "";
-									return false;
-								}
-							}
+							if ( !ui.item )
+								return removeIfInvalid( this );
 						}
 					})
 					.addClass( "ui-widget ui-widget-content ui-corner-left" );
 
 				input.data( "autocomplete" )._renderItem = function( ul, item ) {
-					return $( "<li></li>" )
+					return $( "<li>" )
 						.data( "item.autocomplete", item )
 						.append( "<a>" + item.label + "</a>" )
 						.appendTo( ul );
@@ -109,9 +120,13 @@
 						// close if already visible
 						if ( input.autocomplete( "widget" ).is( ":visible" ) ) {
 							input.autocomplete( "close" );
+							removeIfInvalid( input );
 							return;
 						}
 
+						// work around a bug (likely same cause as #5265)
+						$( this ).blur();
+
 						// pass empty string as value to search for, displaying all results
 						input.autocomplete( "search", "" );
 						input.focus();
@@ -121,10 +136,9 @@
 						.tooltip({
 							position: {
 								of: this.button
-							}
-						})
-						.tooltip( "widget" )
-							.addClass( "ui-state-highlight" );
+							},
+							tooltipClass: "ui-state-highlight"
+						});
 			},
 
 			destroy: function() {

diff --git a/demos/autocomplete/custom-data.html b/demos/autocomplete/custom-data.html
@@ -67,7 +67,7 @@
 			}
 		})
 		.data( "autocomplete" )._renderItem = function( ul, item ) {
-			return $( "<li></li>" )
+			return $( "<li>" )
 				.data( "item.autocomplete", item )
 				.append( "<a>" + item.label + "<br>" + item.desc + "</a>" )
 				.appendTo( ul );
@@ -79,9 +79,9 @@
 
 <div class="demo">
 	<div id="project-label">Select a project (type "j" for a start):</div>
-	<img id="project-icon" src="images/transparent_1x1.png" class="ui-state-default"/>
-	<input id="project"/>
-	<input type="hidden" id="project-id"/>
+	<img id="project-icon" src="images/transparent_1x1.png" class="ui-state-default">
+	<input id="project">
+	<input type="hidden" id="project-id">
 	<p id="project-description"></p>
 </div><!-- End demo -->