Merge branch 'master' into selectmenu

Author: fnagel

AUTHORS.txt

@@ -4,14 +4,14 @@ A list of current team members is available at http://jqueryui.com/about
 Paul Bakaus <paul.bakaus@googlemail.com>
 Richard Worth <rdworth@gmail.com>
 Yehuda Katz <wycats@gmail.com>
-Sean Catchpole <littlecooldude@gmail.com>
+Sean Catchpole <sean@sunsean.com>
 John Resig <jeresig@gmail.com>
-Tane Piper <tane@tanepiper.com>
+Tane Piper <piper.tane@gmail.com>
 Dmitri Gaskin <dmitrig01@gmail.com>
 Klaus Hartl <klaus.hartl@googlemail.com>
 Stefan Petre <stefan.petre@gmail.com>
 Gilles van den Hoven <gilles@webunity.nl>
-Micheil Smith <micheil@brandedcode.com>
+Micheil Bryan Smith <micheil@brandedcode.com>
 Jörn Zaefferer <joern.zaefferer@gmail.com>
 Marc Grabanski <m@marcgrabanski.com>
 Keith Wood <kbwood.au@gmail.com>
@@ -81,9 +81,9 @@ Khaled AlHourani <me@khaledalhourani.com>
 Marian Rudzynski <mr@impaled.org>
 Jean-Francois Remy <jfremy@virtuoz.com>
 Doug Blood <dougblood@gmail.com>
-Filippo Cavallarin <poplix@papuasia.org>
+Filippo Cavallarin <filippo.cavallarin@codseq.it>
 Heiko Henning <h.henning@educa.ch>
-Aliaxandr Rahalevich <saksmlz@gmail.com>
+Aliaksandr Rahalevich <saksmlz@gmail.com>
 Mario Visic <mario@mariovisic.com>
 Xavi Ramirez <xavi.rmz@gmail.com>
 Max Schnur <max.schnur@gmail.com>
@@ -92,7 +92,7 @@ Corey Frang <gnarf@gnarf.net>
 Aaron Peterson <aaronp123@yahoo.com>
 Ivan Peters <ivan@ivanpeters.com>
 Mohamed Cherif Bouchelaghem <cherifbouchelaghem@yahoo.fr>
-Marcos Sousa <marcos.sousa@corp.globo.com>
+Marcos Sousa <falecomigo@marcossousa.com>
 Michael DellaNoce <mdellanoce@mailtrust.com>
 George Marshall <echosx@gmail.com>
 Tobias Brunner <tobias@strongswan.org>
@@ -114,8 +114,8 @@ Hans Hillen <hans.hillen@gmail.com>
 Mark Johnson <virgofx@live.com>
 Trey Hunner <treyhunner@gmail.com>
 Shane Whittet <whittet@gmail.com>
-Edward Faulkner <ef@alum.mit.edu>
-Adam Baratz <adam.baratz@gmail.com>
+Edward A Faulkner <ef@alum.mit.edu>
+Adam Baratz <adam@adambaratz.com>
 Kato Kazuyoshi <kato.kazuyoshi@gmail.com>
 Eike Send <eike.send@gmail.com>
 Kris Borchers <kris.borchers@gmail.com>
@@ -125,27 +125,27 @@ Carson McDonald <carson@ioncannon.net>
 Jason Davies <jason@jasondavies.com>
 Garrison Locke <gplocke@gmail.com>
 David Murdoch <musicisair@yahoo.com>
-Ben Boyle <benjamins.boyle@gmail.com>
+Benjamin Scott Boyle <benjamins.boyle@gmail.com>
 Jesse Baird <jebaird@gmail.com>
 Jonathan Vingiano <jvingiano@gmail.com>
 Dylan Just <dev@ephox.com>
-Tomy Kaira <tomykaira@gmail.com>
+Hiroshi Tomita <tomykaira@gmail.com>
 Glenn Goodrich <glenn.goodrich@gmail.com>
-Ashek Elahi <mail.ashek@gmail.com>
+Tarafder Ashek-E-Elahi <mail.ashek@gmail.com>
 Ryan Neufeld <ryan@neufeldmail.com>
 Marc Neuwirth <marc.neuwirth@gmail.com>
 Philip Graham <philip.robert.graham@gmail.com>
 Benjamin Sterling <benjamin.sterling@kenzomedia.com>
-Wesley Walser <wwalser@atlassian.com>
+Wesley Walser <waw325@gmail.com>
 Kouhei Sutou <kou@clear-code.com>
-Karl Kirch <karl.ctr.kirch@faa.gov>
+Karl Kirch <karlkrch@gmail.com>
 Chris Kelly <ckdake@ckdake.com>
 Jay Oster <jay@loyalize.com>
-Alex Polomoshnov <alex.polomoshnov@gmail.com>
+Alexander Polomoshnov <alex.polomoshnov@gmail.com>
 David Leal <dgleal@gmail.com>
-igor milla <igor.fsp.milla@gmail.com>
+Igor Milla <igor.fsp.milla@gmail.com>
 Dave Methvin <dave.methvin@gmail.com>
-Florian Gutmann <blackfeet@gmx.at>
+Florian Gutmann <f.gutmann@chronimo.com>
 Marwan Al Jubeh <marwan.aljubeh@gmail.com>
 Milan Broum <midlis@googlemail.com>
 Sebastian Sauer <info@dynpages.de>
@@ -157,7 +157,7 @@ David Soms <david.soms@gmail.com>
 David De Sloovere <david.desloovere@hotmail.com>
 Michael P. Jung <michael.jung@terreon.de>
 Shannon Pekary <spekary@gmail.com>
-Matthew Hutton <meh@corefiling.co.uk>
+Matthew Edward Hutton <meh@corefiling.co.uk>
 James Khoury <james@jameskhoury.com>
 Rob Loach <robloach@gmail.com>
 Alberto Monteiro <betimbrasil@gmail.com>
@@ -168,7 +168,7 @@ Genie <386@mail.com>
 Rick Waldron <waldron.rick@gmail.com>
 Ian Simpson <spoonlikesham@gmail.com>
 Lev Kitsis <spam4lev@gmail.com>
-TJ VanToll <tj.vantoll@gmail.com>
+Ted VanToll <tj.vantoll@gmail.com>
 Justin Domnitz <jdomnitz@gmail.com>
 Douglas Cerna <douglascerna@yahoo.com>
 Bert ter Heide <bertjh@hotmail.com>
@@ -189,11 +189,11 @@ Eneko Illarramendi <eneko@illarra.com>
 EungJun Yi <semtlenori@gmail.com>
 Courtland Allen <courtlandallen@gmail.com>
 Viktar Varvanovich <non4eg@gmail.com>
-Danny Trunk <dtrunk90@googlemail.com>
+Danny Trunk <dtrunk90@gmail.com>
 Pavel Stetina <pavel.stetina@nangu.tv>
-Mike Stay <metaweta@gmail.com>
+Michael Stay <metaweta@gmail.com>
 Steven Roussey <sroussey@gmail.com>
-Mike Hollis <hollis21@gmail.com>
+Michael Hollis <hollis21@gmail.com>
 Lee Rowlands <lee.rowlands@previousnext.com.au>
 Timmy Willison <timmywillisn@gmail.com>
 Karl Swedberg <kswedberg@gmail.com>

build/.jshintrc

@@ -0,0 +1,13 @@
+{
+	"curly": true,
+	"eqnull": true,
+	"eqeqeq": true,
+	"expr": true,
+	"noarg": true,
+	"node": true,
+	"onevar": true,
+	"smarttabs": true,
+	"strict": false,
+	"trailing": true,
+	"undef": true
+}

build/release/release.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+/*global cat:true cd:true cp:true echo:true exec:true exit:true ls:true*/
 
 var baseDir, repoDir, prevVersion, newVersion, nextVersion, tagTime,
 	fs = require( "fs" ),
@@ -40,6 +41,9 @@ walk([
 	section( "gathering contributors" ),
 	gatherContributors,
 
+	section( "generating quick download" ),
+	generateQuickDownload,
+
 	section( "updating trac" ),
 	updateTrac,
 	confirm
@@ -250,13 +254,41 @@ function gatherContributors() {
 	echo ( "Adding people thanked in commits..." );
 	contributors = contributors.concat(
 		gitLog( "%b%n%s" ).filter(function( line ) {
-			return /thank/i.test( line );
+			return (/thank/i).test( line );
 		}));
 
 	fs.writeFileSync( contributorsPath, contributors.join( "\n" ) );
 	echo( "Stored contributors in " + contributorsPath.cyan + "." );
 }
 
+function generateQuickDownload() {
+	var config,
+		downloadDir = repoDir + "/node_modules/download.jqueryui.com",
+		filename = "jquery-ui-" + newVersion + ".custom.zip",
+		destination = baseDir + "/" + filename;
+
+	cd( downloadDir );
+
+	// Update jQuery UI version for download builder
+	config = JSON.parse( cat( "config.json" ) );
+	config.jqueryUi = newVersion;
+	JSON.stringify( config ).to( "config.json" );
+
+	// Generate quick download
+	// TODO: Find a way to avoid having to clone jquery-ui inside download builder
+	if ( exec( "grunt prepare build" ).code !== 0 ) {
+		abort( "Error generating quick download." );
+	}
+	cp( downloadDir + "/release/" + filename, destination );
+	// cp() doesn't have error handling, so check for the file
+	if ( ls( destination ).length !== 1 ) {
+		abort( "Error copying quick download." );
+	}
+
+	// Go back to repo directory for consistency
+	cd( repoDir );
+}
+
 function updateTrac() {
 	echo( newVersion.cyan + " was tagged at " + tagTime.cyan + "." );
 	echo( "Close the " + newVersion.cyan + " Milestone with the above date and time." );
@@ -347,8 +379,8 @@ function bootstrap( fn ) {
 			return process.exit( 1 );
 		}
 
-		require( baseDir + "/node_modules/shelljs/global" );
-		require( baseDir + "/node_modules/colors" );
+		require( "shelljs/global" );
+		require( "colors" );
 
 		fn();
 	});

build/tasks/build.js

@@ -177,8 +177,8 @@ grunt.registerTask( "generate_themes", function() {
 		distFolder = "dist/" + grunt.template.process( grunt.config( "files.dist" ), grunt.config() );
 	try {
 		require.resolve( "download.jqueryui.com" );
-	} catch( e ) {
-		throw "You need to manually install download.jqueryui.com for this task to work";
+	} 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

demos/datepicker/date-range.html

@@ -15,15 +15,15 @@
 			defaultDate: "+1w",
 			changeMonth: true,
 			numberOfMonths: 3,
-			onSelect: function( selectedDate ) {
+			onClose: function( selectedDate ) {
 				$( "#to" ).datepicker( "option", "minDate", selectedDate );
 			}
 		});
 		$( "#to" ).datepicker({
 			defaultDate: "+1w",
 			changeMonth: true,
 			numberOfMonths: 3,
-			onSelect: function( selectedDate ) {
+			onClose: function( selectedDate ) {
 				$( "#from" ).datepicker( "option", "maxDate", selectedDate );
 			}
 		});

demos/position/cycler.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<meta charset="utf-8">
-	<title>jQuery UI Position - Default functionality</title>
+	<title>jQuery UI Position - Image Cycler</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="../../jquery-1.8.2.js"></script>
 	<script src="../../ui/jquery.ui.core.js"></script>

demos/spinner/currency.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<meta charset="utf-8">
-	<title>jQuery UI Spinner - Default functionality</title>
+	<title>jQuery UI Spinner - Currency</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
 	<script src="../../jquery-1.8.2.js"></script>
 	<script src="../../external/jquery.mousewheel.js"></script>

demos/tooltip/custom-style.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<meta charset="utf-8">
-	<title>jQuery UI Tooltip - Default functionality</title>
+	<title>jQuery UI Tooltip - Custom Styling</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.tooltip.css">
 	<script src="../../jquery-1.8.2.js"></script>
 	<script src="../../ui/jquery.ui.core.js"></script>
@@ -85,7 +85,7 @@
 <a href="http://themeroller.com" title="ThemeRoller: jQuery UI's theme builder application">ThemeRoller</a>
 will also style tooltips accordingly.</p>
 <p>Tooltips are also useful for form elements, to show some additional information in the context of each field.</p>
-<p><label for="age">Your age:</label><input id="age" title="We ask for your age only for statistical purposes."></p>
+<p><label for="age">Your age:</label> <input id="age" title="We ask for your age only for statistical purposes."></p>
 <p>Hover the field to see the tooltip.</p>
 
 <div class="demo-description">

grunt.js

@@ -287,7 +287,7 @@ grunt.initConfig({
 			// TODO remove items from this list once rewritten
 			return !( /(mouse|datepicker|draggable|droppable|resizable|selectable|sortable)\.js$/ ).test( file );
 		}),
-		grunt: [ "grunt.js", "build/tasks/*.js" ],
+		grunt: [ "grunt.js", "build/**/*.js" ],
 		tests: "tests/unit/**/*.js"
 	},
 	csslint: {

package.json

@@ -2,7 +2,7 @@
 	"name": "jquery-ui",
 	"title": "jQuery UI",
 	"description": "A curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library.",
-	"version": "1.9.0pre",
+	"version": "1.9.1pre",
 	"homepage": "http://jqueryui.com",
 	"author": {
 		"name": "jQuery Foundation and other contributors",

tests/jquery.simulate.js

@@ -148,7 +148,7 @@ $.extend( $.simulate.prototype, {
 		}
 
 		// TODO: can we hook into core's logic?
-		if ( $.browser.msie || $.browser.opera ) {
+		if ( $.ui.ie || (({}).toString.call( window.opera ) === "[object Opera]") ) {
 			// TODO: is charCode ever <0 ? Can we just use charCode || keyCode?
 			event.keyCode = (options.charCode > 0) ? options.charCode : options.keyCode;
 			event.charCode = undefined;

tests/unit/datepicker/datepicker_core.js

@@ -59,7 +59,7 @@ test('baseStructure', function() {
 	var header, title, table, thead, week, panel, inl, child,
 		inp = init('#inp').focus(),
 		dp = $('#ui-datepicker-div'),
-		iframe = ($.browser.msie && parseInt($.browser.version, 10) < 7);
+		iframe = ($.ui.ie6);
 	ok(dp.is(':visible'), 'Structure - datepicker visible');
 	ok(!dp.is('.ui-datepicker-rtl'), 'Structure - not right-to-left');
 	ok(!dp.is('.ui-datepicker-multi'), 'Structure - not multi-month');
@@ -186,7 +186,7 @@ test('customStructure', function() {
 		inp = init('#inp', $.datepicker.regional.he);
 	inp.data('showButtonPanel.datepicker',true);
 	inp.focus();
-	iframe = ($.browser.msie && parseInt($.browser.version, 10) < 7);
+	iframe = ($.ui.ie6);
 	ok(dp.is('.ui-datepicker-rtl'), 'Structure RTL - right-to-left');
 	header = dp.children(':first');
 	ok(header.is('div.ui-datepicker-header'), 'Structure RTL - header division');

tests/unit/tabs/tabs_options.js

@@ -7,7 +7,7 @@ var disabled = TestHelpers.tabs.disabled,
 module( "tabs: options" );
 
 test( "{ active: default }", function() {
-	expect( 4 );
+	expect( 6 );
 
 	var element = $( "#tabs1" ).tabs();
 	equal( element.tabs( "option", "active" ), 0, "should be 0 by default" );
@@ -19,6 +19,12 @@ test( "{ active: default }", function() {
 	equal( element.tabs( "option", "active" ), 2, "should be 2 based on URL" );
 	state( element, 0, 0, 1 );
 	element.tabs( "destroy" );
+
+	location.hash = "#custom-id";
+	element = $( "#tabs2" ).tabs();
+	equal( element.tabs( "option", "active" ), 3, "should be 3 based on URL" );
+	state( element, 0, 0, 0, 1, 0 );
+	element.tabs( "destroy" );
 	location.hash = "#";
 });
 

tests/unit/tooltip/tooltip_methods.js

@@ -3,13 +3,20 @@
 module( "tooltip: methods" );
 
 test( "destroy", function() {
-	expect( 2 );
+	expect( 3 );
+	var element = $( "#tooltipped1" );
+
 	domEqual( "#tooltipped1", function() {
-		$( "#tooltipped1" ).tooltip().tooltip( "destroy" );
+		element.tooltip().tooltip( "destroy" );
 	});
 
 	// make sure that open tooltips are removed on destroy
-	$( "#tooltipped1" ).tooltip().tooltip( "open" ).tooltip( "destroy" );
+	domEqual( "#tooltipped1", function() {
+		element
+			.tooltip()
+			.tooltip( "open", $.Event( "mouseover", { target: element[0] }) )
+			.tooltip( "destroy" );
+	});
 	equal( $( ".ui-tooltip" ).length, 0 );
 });
 
@@ -29,6 +36,23 @@ test( "open/close", function() {
 	$.fx.off = false;
 });
 
+// #8626 - Calling open() without an event
+test( "open/close with tracking", function() {
+	expect( 3 );
+	$.fx.off = true;
+	var tooltip,
+		element = $( "#tooltipped1" ).tooltip({ track: true });
+	equal( $( ".ui-tooltip" ).length, 0, "no tooltip on init" );
+
+	element.tooltip( "open" );
+	tooltip = $( "#" + element.data( "ui-tooltip-id" ) );
+	ok( tooltip.is( ":visible" ) );
+
+	element.tooltip( "close" );
+	ok( tooltip.is( ":hidden" ) );
+	$.fx.off = false;
+});
+
 test( "enable/disable", function() {
 	expect( 7 );
 	$.fx.off = true;

themes/base/jquery.ui.autocomplete.css

@@ -8,7 +8,11 @@
  *
  * http://docs.jquery.com/UI/Autocomplete#theming
  */
-.ui-autocomplete { position: absolute; cursor: default; }	
+.ui-autocomplete {
+	position: absolute;
+	top: 0; /* #8656 */
+	cursor: default;
+}
 
 /* workarounds */
 * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */