Merge branch 'master' into selectmenu

Author: fnagel

Gruntfile.js

@@ -173,34 +173,19 @@ grunt.initConfig({
 		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|dialog|tooltip|draggable)\.html$/ ).test( file );
 		})
 	},
 	jshint: {
-		ui: {
-			options: {
-				jshintrc: "ui/.jshintrc"
-			},
-			files: {
-				src: "ui/*.js"
-			}
-		},
-		grunt: {
-			options: {
-				jshintrc: ".jshintrc"
-			},
-			files: {
-				src: [ "Gruntfile.js", "build/**/*.js" ]
-			}
+		options: {
+			jshintrc: true
 		},
-		tests: {
-			options: {
-				jshintrc: "tests/.jshintrc"
-			},
-			files: {
-				src: "tests/unit/**/*.js"
-			}
-		}
+		all: [
+			"ui/*.js",
+			"Gruntfile.js",
+			"build/**/*.js",
+			"tests/unit/**/*.js"
+		]
 	},
 	csslint: {
 		base_theme: {

README.md

@@ -1,16 +1,16 @@
-[jQuery UI](http://jqueryui.com/) - Interactions and Widgets for the web
-================================
+# [jQuery UI](http://jqueryui.com/) - Interactions and Widgets for the web
 
 jQuery UI is a curated set of user interface interactions, effects, widgets, and themes built on top of jQuery. Whether you're building highly interactive web applications, or you just need to add a date picker to a form control, jQuery UI is the perfect choice.
 
 If you want to use jQuery UI, go to [jqueryui.com](http://jqueryui.com) to get started, [jqueryui.com/demos/](http://jqueryui.com/demos/) for demos, [api.jqueryui.com](http://api.jqueryui.com/) for API documentation, or the [Using jQuery UI Forum](http://forum.jquery.com/using-jquery-ui) for discussions and questions.
 
+If you want to report a bug/issue, please visit [bugs.jqueryui.com](http://bugs.jqueryui.com).
+
 If you are interested in helping develop jQuery UI, you are in the right place.
 To discuss development with team members and the community, visit the [Developing jQuery UI Forum](http://forum.jquery.com/developing-jquery-ui) or [#jqueryui-dev on irc.freenode.net](http://irc.jquery.org/).
 
 
-For contributors
----
+## For contributors
 
 If you want to help and provide a patch for a bugfix or new feature, please take
 a few minutes and look at [our Getting Involved guide](http://wiki.jqueryui.com/w/page/35263114/Getting-Involved).
@@ -22,8 +22,7 @@ pull request for that branch. Don't mix unrelated changes. You can use the commi
 message as the description for the pull request.
 
 
-Running the Unit Tests
----
+## Running the Unit Tests
 
 Run the unit tests with a local server that supports PHP. No database is required. Pre-configured php local servers are available for Windows and Mac. Here are some options:
 
@@ -33,8 +32,7 @@ Run the unit tests with a local server that supports PHP. No database is require
 - [Mongoose (most platforms)](http://code.google.com/p/mongoose/)
 
 
-Building jQuery UI
----
+## Building jQuery UI
 
 jQuery UI uses the [Grunt](http://github.com/gruntjs/grunt) build system.
 
@@ -61,8 +59,7 @@ grunt --help
 ```
 
 
-For committers
----
+## For committers
 
 When looking at pull requests, first check for [proper commit messages](http://wiki.jqueryui.com/w/page/12137724/Bug-Fixing-Guide).
 

build/widget.json

@@ -21,7 +21,7 @@
 	},
 	"button": {
 		"dependencies": [],
-		"description": "Enhances a form with themable buttons.",
+		"description": "Enhances a form with themeable buttons.",
 		"keywords": [
 			"form",
 			"radio",

demos/autocomplete/categories.html

@@ -21,6 +21,10 @@
 	</style>
 	<script>
 	$.widget( "custom.catcomplete", $.ui.autocomplete, {
+		_create: function() {
+			this._super();
+			this.menu.option( "items", "> :not(.ui-autocomplete-category)" );
+		},
 		_renderMenu: function( ul, items ) {
 			var that = this,
 				currentCategory = "";

demos/menu/default.html

@@ -30,7 +30,7 @@
 		<ul>
 			<li class="ui-state-disabled">Ada</li>
 			<li>Saarland</li>
-			<li>Salzburg</li>
+			<li>Salzburg an der schönen Donau</li>
 		</ul>
 	</li>
 	<li>Saarland</li>

demos/menu/icons.html

@@ -22,19 +22,20 @@
 <body>
 
 <ul id="menu">
-	<li><a href="#"><span class="ui-icon ui-icon-disk"></span>Save</a></li>
-	<li><a href="#"><span class="ui-icon ui-icon-zoomin"></span>Zoom In</a></li>
-	<li><a href="#"><span class="ui-icon ui-icon-zoomout"></span>Zoom Out</a></li>
-	<li class="ui-state-disabled"><a href="#"><span class="ui-icon ui-icon-print"></span>Print...</a></li>
+	<li><span class="ui-icon ui-icon-disk"></span>Save</li>
+	<li><span class="ui-icon ui-icon-zoomin"></span>Zoom In</li>
+	<li><span class="ui-icon ui-icon-zoomout"></span>Zoom Out</li>
+	<li class="ui-state-disabled"><span class="ui-icon ui-icon-print"></span>Print...</li>
 	<li>
-		<a href="#">Playback</a>
+		Playback
 		<ul>
-			<li><a href="#"><span class="ui-icon ui-icon-seek-start"></span>Prev</a></li>
-			<li><a href="#"><span class="ui-icon ui-icon-stop"></span>Stop</a></li>
-			<li><a href="#"><span class="ui-icon ui-icon-play"></span>Play</a></li>
-			<li><a href="#"><span class="ui-icon ui-icon-seek-end"></span>Next</a></li>
+			<li><span class="ui-icon ui-icon-seek-start"></span>Prev</li>
+			<li><span class="ui-icon ui-icon-stop"></span>Stop</li>
+			<li><span class="ui-icon ui-icon-play"></span>Play</li>
+			<li><span class="ui-icon ui-icon-seek-end"></span>Next</li>
 		</ul>
 	</li>
+	<li>Learn more about this menu</li>
 </ul>
 
 <div class="demo-description">

demos/resizable/delay-start.html

@@ -39,7 +39,7 @@ <h3 class="ui-widget-header">Distance</h3>
 </div>
 
 <div class="demo-description">
-<p>Delay the start of resizng for a number of milliseconds with the <code>delay</code> option; prevent resizing until the cursor is held down and dragged a specifed number of pixels with the <code>distance</code> option.</p>
+<p>Delay the start of resizing for a number of milliseconds with the <code>delay</code> option; prevent resizing until the cursor is held down and dragged a specifed number of pixels with the <code>distance</code> option.</p>
 </div>
 </body>
 </html>

package.json

@@ -57,7 +57,7 @@
 	"dependencies": {},
 	"devDependencies": {
 		"grunt": "0.4.1",
-		"grunt-contrib-jshint": "0.6.3",
+		"grunt-contrib-jshint": "0.7.1",
 		"grunt-contrib-uglify": "0.1.1",
 		"grunt-contrib-concat": "0.1.3",
 		"grunt-contrib-qunit": "0.2.0",

tests/unit/accordion/accordion_core.js

@@ -46,29 +46,29 @@ test( "accessibility", function () {
 
 	equal( headers.eq( 1 ).attr( "tabindex" ), 0, "active header has tabindex=0" );
 	equal( headers.eq( 1 ).attr( "aria-selected" ), "true", "active tab has aria-selected=true" );
-	equal( headers.eq( 1 ).next().attr( "aria-expanded" ), "true", "active tabpanel has aria-expanded=true" );
+	equal( headers.eq( 1 ).attr( "aria-expanded" ), "true", "active tab has aria-expanded=true" );
 	equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "false", "active tabpanel has aria-hidden=false" );
 	equal( headers.eq( 0 ).attr( "tabindex" ), -1, "inactive header has tabindex=-1" );
 	equal( headers.eq( 0 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
-	equal( headers.eq( 0 ).next().attr( "aria-expanded" ), "false", "inactive tabpanel has aria-expanded=false" );
+	equal( headers.eq( 0 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded=false" );
 	equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel has aria-hidden=true" );
 	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header has tabindex=-1" );
 	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
-	equal( headers.eq( 2 ).next().attr( "aria-expanded" ), "false", "inactive tabpanel has aria-expanded=false" );
+	equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded=false" );
 	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel has aria-hidden=true" );
 
 	element.accordion( "option", "active", 0 );
 	equal( headers.eq( 0 ).attr( "tabindex" ), 0, "active header has tabindex=0" );
 	equal( headers.eq( 0 ).attr( "aria-selected" ), "true", "active tab has aria-selected=true" );
-	equal( headers.eq( 0 ).next().attr( "aria-expanded" ), "true", "active tabpanel has aria-expanded=true" );
+	equal( headers.eq( 0 ).attr( "aria-expanded" ), "true", "active tab has aria-expanded=true" );
 	equal( headers.eq( 0 ).next().attr( "aria-hidden" ), "false", "active tabpanel has aria-hidden=false" );
 	equal( headers.eq( 1 ).attr( "tabindex" ), -1, "inactive header has tabindex=-1" );
 	equal( headers.eq( 1 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
-	equal( headers.eq( 1 ).next().attr( "aria-expanded" ), "false", "inactive tabpanel has aria-expanded=false" );
+	equal( headers.eq( 1 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded=false" );
 	equal( headers.eq( 1 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel has aria-hidden=true" );
 	equal( headers.eq( 2 ).attr( "tabindex" ), -1, "inactive header has tabindex=-1" );
 	equal( headers.eq( 2 ).attr( "aria-selected" ), "false", "inactive tab has aria-selected=false" );
-	equal( headers.eq( 2 ).next().attr( "aria-expanded" ), "false", "inactive tabpanel has aria-expanded=false" );
+	equal( headers.eq( 2 ).attr( "aria-expanded" ), "false", "inactive tab has aria-expanded=false" );
 	equal( headers.eq( 2 ).next().attr( "aria-hidden" ), "true", "inactive tabpanel has aria-hidden=true" );
 });
 

tests/unit/draggable/draggable.html

@@ -8,8 +8,38 @@
 	<link rel="stylesheet" href="../../../external/qunit.css">
 
 	<style>
+		#main {
+			width: 1000px;
+			height: 1000px;
+			overflow: scroll;
+			overflow-x: scroll;
+			overflow-y: scroll;
+			position: relative;
+			left: 0;
+			top: 0;
+		}
+		#main-forceScrollable {
+			width: 1100px;
+			height: 1100px;
+		}
+		#scrollParent {
+			width: 1200px;
+			height: 1200px;
+			position: relative;
+			left: 0;
+			top: 0;
+			overflow: hidden;
+			overflow-x: hidden;
+			overflow-y: hidden;
+		}
+		#scrollParent-forceScrollable {
+			width: 1300px;
+			height: 1300px;
+		}
 		/* See #9077 */
-		#draggable3, #draggable4 { z-index: 100; }
+		#draggable3, #draggable4 {
+			z-index: 100;
+		}
 	</style>
 
 	<script src="../../../external/qunit.js"></script>
@@ -46,10 +76,14 @@ <h2 id="qunit-banner"></h2>
 <h2 id="qunit-userAgent"></h2>
 <ol id="qunit-tests"></ol>
 <div id="qunit-fixture">
-	<div id="main">
-		<div id="draggable1" style="background: green; width: 200px; height: 100px;">Relative</div>
-		<div id="draggable2" style="background: green; width: 200px; height: 100px; position: absolute; top: 10px; left: 10px;"><span><em>Absolute</em></span></div>
-		<div id="droppable" style="background: green; width: 200px; height: 100px; position: absolute; top: 110px; left: 110px;"><span>Absolute</span></div>
+	<div id="scrollParent">
+		<div id="main">
+			<div id="draggable1" style="background: green; width: 200px; height: 100px;">Relative</div>
+			<div id="draggable2" style="background: green; width: 200px; height: 100px; position: absolute; top: 10px; left: 10px;"><span><em>Absolute</em></span></div>
+			<div id="droppable" style="background: green; width: 200px; height: 100px; position: absolute; top: 110px; left: 110px;"><span>Absolute</span></div>
+			<div id="main-forceScrollable"></div>
+		</div>
+		<div id="scrollParent-forceScrollable"></div>
 	</div>
 	<div style="width: 1px; height: 1000px;"></div>
 	<div style="position: absolute; width: 1px; height: 2000px;"></div>