Merge branch 'master' into datepicker

Author: fnagel

.gitignore

@@ -1,3 +1,4 @@
 dist
+bower_components
 node_modules
-.sizecache.json
+.sizecache.json

.jscsrc

@@ -8,8 +8,5 @@
 	"es3": true,
 
 	// We want to output all errors
-	"maxErrors": 1000000,
-
-	// Ref https://github.com/jquery/contribute.jquery.org/issues/80#issuecomment-45253460
-	"maximumLineLength": null
+	"maxErrors": 1000000
 }

.mailmap

@@ -17,7 +17,7 @@ Christoph Rönsch <christoph.roensch@arcor.de>
 Corey Frang <gnarf37@gmail.com> <gnarf@gnarf.net>
 Courtland Allen <courtlandallen@gmail.com>
 Dan Streetman <ddstreet@ieee.org>
-Dan Strohl <dstrohl@users.noreply.github.com>
+Dan Strohl <dan@wjcg.net> <dstrohl@users.noreply.github.com>
 Danny Trunk <dtrunk90@gmail.com> <dtrunk90@googlemail.com>
 David De Sloovere <david.desloovere@outlook.com> <david.desloovere@hotmail.com>
 David Murdoch <david@davidmurdoch.com> <musicisair@yahoo.com>

.travis.yml

@@ -2,6 +2,4 @@ sudo: required
 dist: trusty
 language: node_js
 node_js:
-  - "0.12"
-before_script:
-  - npm install -g grunt-cli
+  - "6"

AUTHORS.txt

@@ -321,4 +321,13 @@ Piotr Baran <piotros@wp.pl>
 Mukul Hase <mukulhase@gmail.com>
 Konstantin Dinev <kdinev@mail.bw.edu>
 Rand Scullard <rand@randscullard.com>
-Dan Strohl
+Dan Strohl <dan@wjcg.net>
+Maksim Ryzhikov <rv.maksim@gmail.com>
+Amine HADDAD <haddad@allegorie.tv>
+Amanpreet Singh <apsdehal@gmail.com>
+Alexey Balchunas <bleshik@gmail.com>
+Peter Kehl <peter.kehl@gmail.com>
+Peter Dave Hello <hsu@peterdavehello.org>
+Johannes Schäfer <johnschaefer@gmx.de>
+Ville Skyttä <ville.skytta@iki.fi>
+Ryan Oriecuia <ryan.oriecuia@visioncritical.com>

CONTRIBUTING.md

@@ -27,7 +27,7 @@ git clone git://github.com/jquery/jquery-ui.git
 cd jquery-ui
 ```
 
-The tests can run in any local web server. Ideally you should test your patch in appropriate web browsers and if possible run `grunt` to lint the code and run automated tests (this will happen automatically when you create a pull request). See the [Recommended Setup](#environment-recommended-setup) for setting up Node.js so that the grunt command works.
+The tests can run in any local web server. Ideally you should test your patch in appropriate web browsers and if possible run `npm test` to lint the code and run automated tests (this will happen automatically when you create a pull request). See the [Recommended Setup](#environment-recommended-setup) for setting up Node.js so that the `npm test` command works.
 
 ### Environment: Getting the Source
 
@@ -61,15 +61,9 @@ git pull upstream master
 
 ### Environment: Recommended Setup
 
-jQuery UI uses Node.js & Grunt to automate the building and validation of source code. Here is how to set that up:
+jQuery UI uses Node.js to automate the building and validation of source code. Here is how to set that up:
 
 * Get [Node.js](http://nodejs.org/) (includes NPM, necessary for the next step)
-* Install Grunt cli:
-
-```bash
-npm install -g grunt-cli
-```
-
 * Install local Node.js modules
 
 ```bash
@@ -87,10 +81,10 @@ The tests require a local web server and the samples contain some PHP, so a PHP
 
 ### Running the Tests
 
-To lint the JavaScript, HTML, and CSS, as well as run a smoke test in PhantomJS, run grunt:
+To lint the JavaScript, HTML, and CSS, as well as run a smoke test in PhantomJS, run the full test suite through npm:
 
 ```bash
-grunt
+npm test
 ```
 
 To run the tests for a specific plugin in your browser, open the appropriate file from the `/tests/unit/` directory, for example: `http://localhost/tests/unit/accordion/accordion.html`. The domain will be dependent on your local server configuration; if there is a port, be sure to include it.

Gruntfile.js

@@ -7,18 +7,18 @@ var
 	coreFiles = [
 		"core.js",
 		"widget.js",
-		"mouse.js",
-		"draggable.js",
-		"droppable.js",
-		"resizable.js",
-		"selectable.js",
-		"sortable.js",
+		"widgets/mouse.js",
+		"widgets/draggable.js",
+		"widgets/droppable.js",
+		"widgets/resizable.js",
+		"widgets/selectable.js",
+		"widgets/sortable.js",
 		"effect.js"
 	],
 
 	uiFiles = coreFiles.map(function( file ) {
 		return "ui/" + file;
-	}).concat( expandFiles( "ui/*.js" ).filter(function( file ) {
+	}).concat( expandFiles( "ui/**/*.js" ).filter(function( file ) {
 		return coreFiles.indexOf( file.substring( 3 ) ) === -1;
 	}) ),
 
@@ -178,12 +178,21 @@ grunt.initConfig({
 	},
 
 	jscs: {
-		all: {
+		ui: {
 			options: {
 				config: true
 			},
 			files: {
-				src: [ "demos/**/*.js", "build/**/*.js", "tests/**/*.js", "ui/**/*.js" ]
+				src: [ "demos/**/*.js", "build/**/*.js", "ui/**/*.js" ]
+			}
+		},
+		tests: {
+			options: {
+				config: true,
+				maximumLineLength: null
+			},
+			files: {
+				src: [ "tests/**/*.js" ]
 			}
 		}
 	},
@@ -287,7 +296,7 @@ grunt.initConfig({
 				"jshint/LICENSE": "jshint/LICENSE",
 
 				"jquery/jquery.js": "jquery-1.x/dist/jquery.js",
-				"jquery/MIT-LICENSE.txt": "jquery-1.x/MIT-LICENSE.txt",
+				"jquery/LICENSE.txt": "jquery-1.x/LICENSE.txt",
 
 				"jquery-1.7.0/jquery.js": "jquery-1.7.0/jquery.js",
 				"jquery-1.7.0/MIT-LICENSE.txt": "jquery-1.7.0/MIT-LICENSE.txt",
@@ -337,6 +346,21 @@ grunt.initConfig({
 				"jquery-1.11.3/jquery.js": "jquery-1.11.3/dist/jquery.js",
 				"jquery-1.11.3/MIT-LICENSE.txt": "jquery-1.11.3/MIT-LICENSE.txt",
 
+				"jquery-1.12.0/jquery.js": "jquery-1.12.0/dist/jquery.js",
+				"jquery-1.12.0/LICENSE.txt": "jquery-1.12.0/LICENSE.txt",
+
+				"jquery-1.12.1/jquery.js": "jquery-1.12.1/dist/jquery.js",
+				"jquery-1.12.1/LICENSE.txt": "jquery-1.12.1/LICENSE.txt",
+
+				"jquery-1.12.2/jquery.js": "jquery-1.12.2/dist/jquery.js",
+				"jquery-1.12.2/LICENSE.txt": "jquery-1.12.2/LICENSE.txt",
+
+				"jquery-1.12.3/jquery.js": "jquery-1.12.3/dist/jquery.js",
+				"jquery-1.12.3/LICENSE.txt": "jquery-1.12.3/LICENSE.txt",
+
+				"jquery-1.12.4/jquery.js": "jquery-1.12.4/dist/jquery.js",
+				"jquery-1.12.4/LICENSE.txt": "jquery-1.12.4/LICENSE.txt",
+
 				"jquery-2.0.0/jquery.js": "jquery-2.0.0/jquery.js",
 				"jquery-2.0.0/MIT-LICENSE.txt": "jquery-2.0.0/MIT-LICENSE.txt",
 
@@ -359,7 +383,34 @@ grunt.initConfig({
 				"jquery-2.1.2/MIT-LICENSE.txt": "jquery-2.1.2/MIT-LICENSE.txt",
 
 				"jquery-2.1.3/jquery.js": "jquery-2.1.3/dist/jquery.js",
-				"jquery-2.1.3/MIT-LICENSE.txt": "jquery-2.1.3/MIT-LICENSE.txt"
+				"jquery-2.1.3/MIT-LICENSE.txt": "jquery-2.1.3/MIT-LICENSE.txt",
+
+				"jquery-2.1.4/jquery.js": "jquery-2.1.4/dist/jquery.js",
+				"jquery-2.1.4/MIT-LICENSE.txt": "jquery-2.1.4/MIT-LICENSE.txt",
+
+				"jquery-2.2.0/jquery.js": "jquery-2.2.0/dist/jquery.js",
+				"jquery-2.2.0/LICENSE.txt": "jquery-2.2.0/LICENSE.txt",
+
+				"jquery-2.2.1/jquery.js": "jquery-2.2.1/dist/jquery.js",
+				"jquery-2.2.1/LICENSE.txt": "jquery-2.2.1/LICENSE.txt",
+
+				"jquery-2.2.2/jquery.js": "jquery-2.2.2/dist/jquery.js",
+				"jquery-2.2.2/LICENSE.txt": "jquery-2.2.2/LICENSE.txt",
+
+				"jquery-2.2.3/jquery.js": "jquery-2.2.3/dist/jquery.js",
+				"jquery-2.2.3/LICENSE.txt": "jquery-2.2.3/LICENSE.txt",
+
+				"jquery-2.2.4/jquery.js": "jquery-2.2.4/dist/jquery.js",
+				"jquery-2.2.4/LICENSE.txt": "jquery-2.2.4/LICENSE.txt",
+
+				"jquery-3.0.0/jquery.js": "jquery-3.0.0/dist/jquery.js",
+				"jquery-3.0.0/LICENSE.txt": "jquery-3.0.0/LICENSE.txt",
+
+				"jquery-3.1.0/jquery.js": "jquery-3.1.0/dist/jquery.js",
+				"jquery-3.1.0/LICENSE.txt": "jquery-3.1.0/LICENSE.txt",
+
+				"jquery-3.1.1/jquery.js": "jquery-3.1.1/dist/jquery.js",
+				"jquery-3.1.1/LICENSE.txt": "jquery-3.1.1/LICENSE.txt"
 			}
 		}
 	},
@@ -405,9 +456,7 @@ grunt.registerTask( "update-authors", function() {
 		}
 
 		authors = authors.map(function( author ) {
-			if ( author.match( /^Dan Strohl </ ) ) {
-				return "Dan Strohl";
-			} else if ( author.match( /^Jacek Jędrzejewski </ ) ) {
+			if ( author.match( /^Jacek Jędrzejewski </ ) ) {
 				return "Jacek Jędrzejewski (http://jacek.jedrzejewski.name)";
 			} else if ( author.match( /^Pawel Maruszczyk </ ) ) {
 				return "Pawel Maruszczyk (http://hrabstwo.net)";

bower.json

@@ -7,6 +7,7 @@
 		"external",
 		"tests"
 	],
+	"license": "MIT",
 	"dependencies": {
 		"jquery": ">=1.6"
 	},
@@ -37,14 +38,28 @@
 		"jquery-1.11.1": "jquery#1.11.1",
 		"jquery-1.11.2": "jquery#1.11.2",
 		"jquery-1.11.3": "jquery#1.11.3",
-		"jquery-1.x": "jquery#1.11.3",
+		"jquery-1.12.0": "jquery#1.12.0",
+		"jquery-1.12.1": "jquery#1.12.1",
+		"jquery-1.12.2": "jquery#1.12.2",
+		"jquery-1.12.3": "jquery#1.12.3",
+		"jquery-1.12.4": "jquery#1.12.4",
+		"jquery-1.x": "jquery#1.12.4",
 		"jquery-2.0.0": "jquery#2.0.0",
 		"jquery-2.0.1": "jquery#2.0.1",
 		"jquery-2.0.2": "jquery#2.0.2",
 		"jquery-2.0.3": "jquery#2.0.3",
 		"jquery-2.1.0": "jquery#2.1.0",
 		"jquery-2.1.1": "jquery#2.1.1",
 		"jquery-2.1.2": "jquery#2.1.2",
-		"jquery-2.1.3": "jquery#2.1.3"
+		"jquery-2.1.3": "jquery#2.1.3",
+		"jquery-2.1.4": "jquery#2.1.4",
+		"jquery-2.2.0": "jquery#2.2.0",
+		"jquery-2.2.1": "jquery#2.2.1",
+		"jquery-2.2.2": "jquery#2.2.2",
+		"jquery-2.2.3": "jquery#2.2.3",
+		"jquery-2.2.4": "jquery#2.2.4",
+		"jquery-3.0.0": "jquery#3.0.0",
+		"jquery-3.1.0": "jquery#3.1.0",
+		"jquery-3.1.1": "jquery#3.1.1"
 	}
 }

build/release.js

@@ -35,6 +35,14 @@ function replaceAtVersion() {
 	return matches;
 }
 
+function removeExternals ( packager ) {
+	Object.keys( packager.builtFiles ).forEach( function( filepath ) {
+		if ( /^external\//.test( filepath ) ) {
+			delete packager.builtFiles[ filepath ];
+		}
+	} );
+}
+
 function addManifest( packager ) {
 	var output = packager.builtFiles;
 	output.MANIFEST = Object.keys( output ).sort( function( a, b ) {
@@ -52,7 +60,8 @@ function buildCDNPackage( callback ) {
 	var Package = require( "download.jqueryui.com/lib/package-1-12-themes" );
 	var Packager = require( "node-packager" );
 	var jqueryUi = new JqueryUi( path.resolve( "." ) );
-	var target = fs.createWriteStream( "../" + jqueryUi.pkg.name + "-" + jqueryUi.pkg.version + "-cdn.zip" );
+	var target = fs.createWriteStream( "../" + jqueryUi.pkg.name + "-" + jqueryUi.pkg.version +
+		"-cdn.zip" );
 	var packager = new Packager( jqueryUi.files().cache, Package, {
 		components: jqueryUi.components().map( function( component ) {
 			return component.name;
@@ -61,6 +70,7 @@ function buildCDNPackage( callback ) {
 		themeVars: null
 	} );
 	packager.ready.then( function() {
+		removeExternals( packager );
 		addManifest( packager );
 		packager.toZip( target, {
 			basedir: ""
@@ -82,7 +92,8 @@ Release.define( {
 				"August", "September", "October", "November", "December" ],
 			now = new Date();
 		return "<script>{\n\t\"title\": \"jQuery UI " + Release.newVersion + " Changelog\"\n" +
-			"}</script>\n\nReleased on " + monthNames[ now.getMonth() ] + " " + now.getDate() + ", " + now.getFullYear() + "\n\n";
+			"}</script>\n\nReleased on " + monthNames[ now.getMonth() ] + " " + now.getDate() +
+			", " + now.getFullYear() + "\n\n";
 	},
 	generateArtifacts: function( fn ) {
 		var files = replaceAtVersion();

build/tasks/testswarm.js

@@ -4,23 +4,32 @@ module.exports = function( grunt ) {
 
 var versions = {
 		"git": "git",
-		"1.11": "1.11.0 1.11.1 1.11.2 1.11.3",
-		"1.10": "1.10.0 1.10.2",
-		"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.0 1.7.1 1.7.2"
+		"3.1": "3.1.1",
+		"3.0": "3.0.0",
+		"2.2": "2.2.4",
+		"2.1": "2.1.4",
+		"2.0": "2.0.3",
+		"1.12": "1.12.4",
+		"1.11": "1.11.3",
+		"1.10": "1.10.2",
+		"1.9": "1.9.1",
+		"1.8": "1.8.3",
+		"1.7": "1.7.2"
 	},
 	tests = {
 		"Accordion": "accordion/accordion.html",
 		"Autocomplete": "autocomplete/autocomplete.html",
 		"Button": "button/button.html",
 		"Calendar": "calendar/calendar.html",
+		"Checkboxradio": "checkboxradio/checkboxradio.html",
+		"Controlgroup": "controlgroup/controlgroup.html",
 		"Core": "core/core.html",
 		"Datepicker": "datepicker/datepicker.html",
 		"Dialog": "dialog/dialog.html",
 		"Draggable": "draggable/draggable.html",
 		"Droppable": "droppable/droppable.html",
 		"Effects": "effects/effects.html",
+		"Form Reset Mixin": "form-reset-mixin/form-reset-mixin.html",
 		"Menu": "menu/menu.html",
 		"Position": "position/position.html",
 		"Progressbar": "progressbar/progressbar.html",
@@ -43,12 +52,6 @@ function submit( commit, runs, configFile, extra, done ) {
 		commitUrl = "https://github.com/jquery/jquery-ui/commit/" + commit;
 
 	if ( extra ) {
-
-		// jquery-git doesn't support IE 8.
-		if ( extra === "core git" ) {
-			browserSets = "jquery-ui-future";
-		}
-
 		extra = " (" + extra + ")";
 	}
 

demos/autocomplete/images/jquery_32x32.png

@@ -17,7 +17,7 @@
 			return val.split( /,\s*/ );
 		}
 		function extractLast( term ) {
-			return split( term ).pop();
+			return split( term ).pop();
 		}
 
 		$( "#birds" )