Merge branch 'master' of git://github.com/jquery/jquery-ui into fix-8740

Author: mziech

AUTHORS.txt

@@ -263,3 +263,13 @@ Jacob McCutcheon <jacob.mccutcheon@gmail.com>
 Monika Piotrowicz <monika.piotrowicz@gmail.com>
 Imants Horsts <imants.horsts@inbox.lv>
 Eric Dahl <eric.c.dahl@gmail.com>
+Dave Stein <dave@behance.com>
+Dylan Barrell <dylan@barrell.com>
+Daniel DeGroff <djdegroff@gmail.com>
+Michael Wiencek <mwtuea@gmail.com>
+Thomas Meyer <meyertee@gmail.com>
+Ruslan Yakhyaev <ruslan@ruslan.io>
+Brian J. Dowling <bjd-dev@simplicity.net>
+Ben Higgins <ben@extrahop.com>
+Yermo <yml@yml.com>
+Patrick Stapleton <github@gdi2290.com>

Gruntfile.js

@@ -101,16 +101,7 @@ uiFiles.forEach(function( file ) {
 });
 
 // grunt plugins
-grunt.loadNpmTasks( "grunt-contrib-jshint" );
-grunt.loadNpmTasks( "grunt-contrib-uglify" );
-grunt.loadNpmTasks( "grunt-contrib-concat" );
-grunt.loadNpmTasks( "grunt-contrib-qunit" );
-grunt.loadNpmTasks( "grunt-contrib-csslint" );
-grunt.loadNpmTasks( "grunt-jscs-checker" );
-grunt.loadNpmTasks( "grunt-html" );
-grunt.loadNpmTasks( "grunt-compare-size" );
-grunt.loadNpmTasks( "grunt-git-authors" );
-grunt.loadNpmTasks( "grunt-esformatter" );
+require( "load-grunt-tasks" )( grunt );
 // local testswarm and build tasks
 grunt.loadTasks( "build/tasks" );
 
@@ -166,7 +157,7 @@ grunt.initConfig({
 	},
 	jscs: {
 		// datepicker, sortable, resizable and draggable are getting rewritten, ignore until that's done
-		ui: [ "ui/*.js", "!ui/datepicker.js", "!ui/sortable.js", "!ui/resizable.js", "!ui/draggable.js" ],
+		ui: [ "ui/*.js", "!ui/datepicker.js", "!ui/sortable.js", "!ui/resizable.js" ],
 		// TODO enable this once we have a tool that can help with fixing formatting of existing files
 		// tests: "tests/unit/**/*.js",
 		grunt: "Gruntfile.js"
@@ -180,10 +171,14 @@ grunt.initConfig({
 	},
 	qunit: {
 		files: expandFiles( "tests/unit/**/*.html" ).filter(function( file ) {
-			// disabling everything that doesn't (quite) work with PhantomJS for now
 			// TODO except for all|index|test, try to include more as we go
-			return !( /(all|index|test|dialog|tooltip)\.html$/ ).test( file );
-		})
+			return !( /(all|index|test)\.html$/ ).test( file );
+		}),
+		options: {
+			page: {
+				viewportSize: { width: 700, height: 500 }
+			}
+		}
 	},
 	jshint: {
 		options: {

bower.json

@@ -0,0 +1,13 @@
+{
+	"name": "jquery-ui",
+	"ignore": [
+		"**/.*",
+		"build",
+		"demos",
+		"external",
+		"tests"
+	],
+	"dependencies": {
+		"jquery": ">=1.6"
+	}
+}

build/tasks/build.js

@@ -32,7 +32,8 @@ grunt.registerTask( "manifest", "Generate jquery.json manifest files", function(
 
 	Object.keys( base ).forEach(function( type ) {
 		var baseManifest = base[ type ],
-			plugins = grunt.file.readJSON( "build/" + type + ".json" );
+			plugins = grunt.file.readJSON( "build/" + type + ".json" ),
+			bower = grunt.file.readJSON( "bower.json" );
 
 		Object.keys( plugins ).forEach(function( plugin ) {
 			var manifest,
@@ -62,9 +63,7 @@ grunt.registerTask( "manifest", "Generate jquery.json manifest files", function(
 				docs: data.docs || replace( baseManifest.docs ||
 					"http://api.jqueryui.com/{plugin}/" ),
 				download: "http://jqueryui.com/download/",
-				dependencies: {
-					jquery: ">=1.6"
-				},
+				dependencies: bower.dependencies,
 				// custom
 				category: data.category || type
 			};

build/tasks/testswarm.js

@@ -63,7 +63,7 @@ function submit( commit, runs, configFile, extra, done ) {
 		name: "Commit <a href='" + commitUrl + "'>" + commit.substr( 0, 10 ) + "</a>" + extra,
 		runs: runs,
 		runMax: config.runMax,
-		browserSets: ["popular-no-ie6"]
+		browserSets: ["popular-ui"]
 	}, function( error, passed ) {
 		if ( error ) {
 			grunt.log.error( error );

demos/tabs/bottom.html

@@ -13,7 +13,6 @@
 	<li><a href="collapsible.html">Collapse content</a></li>
 	<li><a href="sortable.html">Sortable</a></li>
 	<li><a href="manipulation.html">Simple manipulation</a></li>
-	<li><a href="bottom.html">Tabs below content</a></li>
 </ul>
 
 </body>

demos/tabs/index.html

@@ -66,10 +66,8 @@
 		height: 25px;
 		box-shadow: 6px 5px 9px -9px black;
 		-webkit-transform: rotate(45deg);
-		-moz-transform: rotate(45deg);
 		-ms-transform: rotate(45deg);
-		-o-transform: rotate(45deg);
-		tranform: rotate(45deg);
+		transform: rotate(45deg);
 	}
 	.arrow.top:after {
 		bottom: -20px;