Merge branch 'master' into interactions

Conflicts:
	tests/unit/draggable/draggable.html
	tests/unit/draggable/draggable_common.js
	tests/unit/draggable/draggable_core.js
	tests/unit/draggable/draggable_options.js
	tests/unit/draggable/draggable_test_helpers.js
	tests/unit/droppable/droppable.html
	ui/jquery.ui.draggable.js
	ui/jquery.ui.droppable.js
	ui/jquery.ui.sortable.js

Author: mikesherov

.mailmap

@@ -0,0 +1,6 @@
+Kris Borchers <kris.borchers@gmail.com>
+Kris Borchers <kris.borchers@gmail.com> <k_borchers@yahoo.com>
+Corey Frang <gnarf@gnarf.net>
+Maggie Costello Wachs <fg.maggie@gmail.com> maggiewachs <maggie@filamentgroup.com>
+Richard Worth <rdworth@gmail.com>
+Jörn Zaefferer <joern.zaefferer@gmail.com>

AUTHORS.txt

@@ -231,3 +231,8 @@ Pavel Selitskas <p.selitskas@gmail.com>
 Bjørn Johansen <bjorn.johansen@metronet.no>
 Matthieu Penant <thieum22@hotmail.com>
 Dominic Barnes <dominic@dbarnes.info>
+David Sullivan <david.sullivan@gmail.com>
+Thomas Jaggi <thomas.jaggi@gmail.com>
+Vahid Sohrabloo <vahid4134@gmail.com>
+Travis Carden <travis.carden@gmail.com>
+Bruno M. Custódio <bruno@brunomcustodio.com>

build/release/release.js

@@ -121,7 +121,7 @@ function getVersions() {
 
 		// TODO: handle 1.10.0
 		// Also see comment above about pre-releases
-		if ( minor === 0 ) {
+		if ( patch === 0 ) {
 			abort( "This script is not smart enough to handle the 1.10.0 release." );
 		}
 

build/tasks/build.js

@@ -159,7 +159,7 @@ grunt.registerMultiTask( "zip", "Create a zip file for release", function() {
 
 grunt.registerMultiTask( "md5", "Create list of md5 hashes for CDN uploads", function() {
 	// remove dest file before creating it, to make sure itself is not included
-	if ( path.existsSync( this.file.dest ) ) {
+	if ( fs.existsSync( this.file.dest ) ) {
 		fs.unlinkSync( this.file.dest );
 	}
 	var crypto = require( "crypto" ),
@@ -175,62 +175,43 @@ grunt.registerMultiTask( "md5", "Create list of md5 hashes for CDN uploads", fun
 });
 
 grunt.registerTask( "generate_themes", function() {
-	var download, files, done,
-		target = "dist/" + grunt.template.process( grunt.config( "files.themes" ), grunt.config() ) + "/",
-		distFolder = "dist/" + grunt.template.process( grunt.config( "files.dist" ), grunt.config() );
+	var download, done,
+		distFolder = "dist/" + grunt.template.process( grunt.config( "files.dist" ), grunt.config() ),
+		target = "dist/" + grunt.template.process( grunt.config( "files.themes" ), grunt.config() ) + "/";
+
 	try {
 		require.resolve( "download.jqueryui.com" );
 	} catch( error ) {
 		throw new Error( "You need to manually install download.jqueryui.com for this task to work" );
 	}
 
-	// copy release files into download builder to avoid cloning again
-	grunt.file.expandFiles( distFolder + "/**" ).forEach(function( file ) {
-		grunt.file.copy( file, "node_modules/download.jqueryui.com/release/" + file.replace(/^dist/, "") );
-	});
-
-	download = new ( require( "download.jqueryui.com" ) )();
-
-	files = grunt.file.expandFiles( distFolder + "/themes/base/**/*" );
-	files.forEach(function( fileName ) {
-		grunt.file.copy( fileName, target + fileName.replace( distFolder, "" ) );
+	download = require( "download.jqueryui.com" )({
+		config: {
+			"jqueryUi": {
+				"stable": { "path": path.resolve( __dirname + "/../../" + distFolder ) }
+			},
+			"jquery": "skip"
+		}
 	});
 
 	done = this.async();
-	grunt.utils.async.forEach( download.themeroller.gallery(), function( theme, done ) {
-		var folderName = theme.folderName(),
-			concatTarget = "css-" + folderName,
-			cssContent = theme.css(),
-			cssFolderName = target + "themes/" + folderName + "/",
-			cssFileName = cssFolderName + "jquery.ui.theme.css",
-			cssFiles = grunt.config.get( "concat.css.src" )[ 1 ].slice();
-
-		grunt.file.write( cssFileName, cssContent );
-
-		// get css components, replace the last file with the current theme
-		cssFiles.splice(-1);
-		cssFiles.push( "<strip_all_banners:" + cssFileName + ">" );
-		grunt.config.get( "concat" )[ concatTarget ] = {
-			src: [ "<banner:meta.bannerCSS>", cssFiles ],
-			dest: cssFolderName + "jquery-ui.css"
-		};
-		grunt.task.run( "concat:" + concatTarget );
-
-		theme.fetchImages(function( err, files ) {
-			if ( err ) {
-				done( err );
-				return;
-			}
-			files.forEach(function( file ) {
-				grunt.file.write( cssFolderName + "images/" + file.path, file.data );
-			});
-			done();
-		});
-	}, function( err ) {
-		if ( err ) {
-			grunt.log.error( err );
+	download.buildThemesBundle(function( error, files ) {
+		if ( error ) {
+			grunt.log.error( error );
+			return done( false );
 		}
-		done( !err );
+
+		done(
+			files.every(function( file ) {
+				try {
+					grunt.file.write( target + file.path, file.data );
+				} catch( err ) {
+					grunt.log.error( err );
+					return false;
+				}
+				return true;
+			}) && grunt.log.writeln( "Generated at " + target )
+		);
 	});
 });
 

build/tasks/testswarm.js

@@ -4,6 +4,7 @@ module.exports = function( grunt ) {
 
 var versions = {
 		"git": "git",
+		"1.9": "1.9.0 1.9.1",
 		"1.8": "1.8.0 1.8.1 1.8.2 1.8.3",
 		"1.7": "1.7 1.7.1 1.7.2",
 		"1.6": "1.6 1.6.1 1.6.2 1.6.3 1.6.4"
@@ -32,30 +33,37 @@ var versions = {
 		"Widget": "widget/widget.html"
 	};
 
-function submit( commit, tests, configFile, version, done ) {
-	var test,
+function submit( commit, runs, configFile, version, done ) {
+	var testName,
 		testswarm = require( "testswarm" ),
-		config = grunt.file.readJSON( configFile ).jqueryui,
-		testBase = config.testUrl + commit + "/tests/unit/",
-		testUrls = [];
-	for ( test in tests ) {
-		testUrls.push( testBase + tests[ test ] );
-	}
+		config = grunt.file.readJSON( configFile ).jqueryui;
 	version = version ? ( version + " " ) : "";
-	testswarm({
+	for ( testName in runs ) {
+		runs[ testName] = config.testUrl + commit + "/tests/unit/" + runs[ testName ];
+	}
+	testswarm.createClient( {
 		url: config.swarmUrl,
 		pollInterval: 10000,
-		timeout: 1000 * 60 * 45,
-		done: done
-	}, {
-		authUsername: config.authUsername,
-		authToken: config.authToken,
-		jobName: 'jQuery UI ' + version + '#<a href="https://github.com/jquery/jquery-ui/commit/' + commit + '">' + commit.substr( 0, 10 ) + '</a>',
-		runMax: config.runMax,
-		"runNames[]": Object.keys( tests ),
-		"runUrls[]": testUrls,
-		"browserSets[]": config.browserSets
-	});
+		timeout: 1000 * 60 * 45
+	} )
+	.addReporter( testswarm.reporters.cli )
+	.auth( {
+		id: config.authUsername,
+		token: config.authToken
+	} )
+	.addjob(
+		{
+			name: 'jQuery UI ' + version + '#<a href="https://github.com/jquery/jquery-ui/commit/' + commit + '">' + commit.substr( 0, 10 ) + '</a>',
+			runs: runs,
+			runMax: config.runMax,
+			browserSets: config.browserSets
+		}, function( err, passed ) {
+			if ( err ) {
+				grunt.log.error( err );
+			}
+			done( passed );
+		}
+	);
 }
 
 grunt.registerTask( "testswarm", function( commit, configFile ) {

demos/accordion/collapsible.html

@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - Collapse content</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
-	<script src="../../jquery-1.8.3.js"></script>
+	<script src="../../jquery-1.9.1.js"></script>
 	<script src="../../ui/jquery.ui.core.js"></script>
 	<script src="../../ui/jquery.ui.widget.js"></script>
 	<script src="../../ui/jquery.ui.accordion.js"></script>

demos/accordion/custom-icons.html

@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - Customize icons</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
-	<script src="../../jquery-1.8.3.js"></script>
+	<script src="../../jquery-1.9.1.js"></script>
 	<script src="../../ui/jquery.ui.core.js"></script>
 	<script src="../../ui/jquery.ui.widget.js"></script>
 	<script src="../../ui/jquery.ui.accordion.js"></script>

demos/accordion/default.html

@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
-	<script src="../../jquery-1.8.3.js"></script>
+	<script src="../../jquery-1.9.1.js"></script>
 	<script src="../../ui/jquery.ui.core.js"></script>
 	<script src="../../ui/jquery.ui.widget.js"></script>
 	<script src="../../ui/jquery.ui.accordion.js"></script>

demos/accordion/fillspace.html

@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - Fill space</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
-	<script src="../../jquery-1.8.3.js"></script>
+	<script src="../../jquery-1.9.1.js"></script>
 	<script src="../../ui/jquery.ui.core.js"></script>
 	<script src="../../ui/jquery.ui.widget.js"></script>
 	<script src="../../ui/jquery.ui.mouse.js"></script>

demos/accordion/hoverintent.html

@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - Open on hoverintent</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
-	<script src="../../jquery-1.8.3.js"></script>
+	<script src="../../jquery-1.9.1.js"></script>
 	<script src="../../ui/jquery.ui.core.js"></script>
 	<script src="../../ui/jquery.ui.widget.js"></script>
 	<script src="../../ui/jquery.ui.accordion.js"></script>
@@ -16,11 +16,11 @@
 		});
 	});
 
-	var cfg = ($.hoverintent = {
-		sensitivity: 7,
-		interval: 100
-	});
-
+	/*
+	 * hoverIntent | Copyright 2011 Brian Cherne
+	 * http://cherne.net/brian/resources/jquery.hoverIntent.html
+	 * modified by the jQuery UI team
+	 */
 	$.event.special.hoverintent = {
 		setup: function() {
 			$( this ).bind( "mouseover", jQuery.event.special.hoverintent.handler );
@@ -29,41 +29,56 @@
 			$( this ).unbind( "mouseover", jQuery.event.special.hoverintent.handler );
 		},
 		handler: function( event ) {
-			var that = this,
+			var currentX, currentY, timeout,
 				args = arguments,
 				target = $( event.target ),
-				cX, cY, pX, pY;
+				previousX = event.pageX,
+				previousY = event.pageY;
 
 			function track( event ) {
-				cX = event.pageX;
-				cY = event.pageY;
+				currentX = event.pageX;
+				currentY = event.pageY;
 			};
-			pX = event.pageX;
-			pY = event.pageY;
+
 			function clear() {
 				target
 					.unbind( "mousemove", track )
-					.unbind( "mouseout", arguments.callee );
+					.unbind( "mouseout", clear );
 				clearTimeout( timeout );
 			}
+
 			function handler() {
-				if ( ( Math.abs( pX - cX ) + Math.abs( pY - cY ) ) < cfg.sensitivity ) {
+				var prop,
+					orig = event;
+
+				if ( ( Math.abs( previousX - currentX ) +
+						Math.abs( previousY - currentY ) ) < 7 ) {
 					clear();
-					event.type = "hoverintent";
-					// prevent accessing the original event since the new event
+
+					event = $.Event( "hoverintent" );
+					for ( prop in orig ) {
+						if ( !( prop in event ) ) {
+							event[ prop ] = orig[ prop ];
+						}
+					}
+					// 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 );
+					delete event.originalEvent;
+
+					target.trigger( event );
 				} else {
-					pX = cX;
-					pY = cY;
-					timeout = setTimeout( handler, cfg.interval );
+					previousX = currentX;
+					previousY = currentY;
+					timeout = setTimeout( handler, 100 );
 				}
 			}
-			var timeout = setTimeout( handler, cfg.interval );
-			target.mousemove( track ).mouseout( clear );
-			return true;
+
+			timeout = setTimeout( handler, 100 );
+			target.bind({
+				mousemove: track,
+				mouseout: clear
+			});
 		}
 	};
 	</script>