Merge branch 'master' into datepicker

Conflicts:
	demos/datepicker/alt-field.html
	demos/datepicker/animation.html
	demos/datepicker/buttonbar.html
	demos/datepicker/date-formats.html
	demos/datepicker/date-range.html
	demos/datepicker/default.html
	demos/datepicker/dropdown-month-year.html
	demos/datepicker/icon-trigger.html
	demos/datepicker/inline.html
	demos/datepicker/localization.html
	demos/datepicker/min-max.html
	demos/datepicker/multiple-calendars.html
	demos/datepicker/other-months.html
	demos/datepicker/show-week.html

Author: fnagel

.gitattributes

@@ -1 +1,5 @@
-*       text=auto
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# JS files must always use LF for tools to work
+*.js eol=lf

Gruntfile.js

@@ -31,11 +31,13 @@ var
 		"button",
 		"datepicker",
 		"dialog",
+		"draggable",
 		"menu",
 		"progressbar",
 		"resizable",
 		"selectable",
 		"selectmenu",
+		"sortable",
 		"slider",
 		"spinner",
 		"tabs",
@@ -160,7 +162,7 @@ grunt.initConfig({
 		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"
+		grunt: [ "Gruntfile.js", "build/tasks/*.js" ]
 	},
 	uglify: minify,
 	htmllint: {
@@ -213,6 +215,28 @@ grunt.initConfig({
 			src: "build/**/*.js"
 		},
 		grunt: "Gruntfile.js"
+	},
+
+	bowercopy: {
+		options: {
+			clean: true
+		},
+		qunit: {
+			files: {
+				"external": "qunit/qunit"
+			}
+		},
+		mousewheel: {
+			files: {
+				"external": "jquery-mousewheel/jquery.mousewheel.js"
+			}
+		},
+		jshint: {
+			files: {
+				"external": "jshint/dist/jshint.js"
+			}
+		},
+		"jquery.js": "jquery/dist/jquery.js"
 	}
 });
 

bower.json

@@ -8,6 +8,11 @@
 		"tests"
 	],
 	"dependencies": {
-		"jquery": ">=1.6"
+		"jquery": ">=1.6 <1.11"
+	},
+	"devDependencies": {
+		"jquery-mousewheel": "3.1.11",
+		"jshint": "2.4.4",
+		"qunit": "1.14.0"
 	}
 }

build/tasks/testswarm.js

@@ -51,8 +51,6 @@ function submit( commit, runs, configFile, extra, done ) {
 
 	testswarm.createClient({
 		url: config.swarmUrl,
-		pollInterval: 10000,
-		timeout: 1000 * 60 * 45
 	})
 	.addReporter( testswarm.reporters.cli )
 	.auth({
@@ -63,7 +61,8 @@ 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-ui"]
+		browserSets: [ "popular-ui" ],
+		timeout: 1000 * 60 * 30
 	}, function( error, passed ) {
 		if ( error ) {
 			grunt.log.error( error );

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/all.css">
-	<script src="../../jquery-1.10.2.js"></script>
+	<script src="../../jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../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/all.css">
-	<script src="../../jquery-1.10.2.js"></script>
+	<script src="../../jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../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/all.css">
-	<script src="../../jquery-1.10.2.js"></script>
+	<script src="../../jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../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/all.css">
-	<script src="../../jquery-1.10.2.js"></script>
+	<script src="../../jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../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/all.css">
-	<script src="../../jquery-1.10.2.js"></script>
+	<script src="../../jquery.js"></script>
 	<script src="../../ui/core.js"></script>
 	<script src="../../ui/widget.js"></script>
 	<script src="../../ui/accordion.js"></script>

demos/accordion/index.html

@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
 	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>jQuery UI Accordion Demos</title>
 </head>
 <body>