Merge branch 'master' into selectmenu

Author: fnagel

Gruntfile.js

@@ -245,7 +245,7 @@ grunt.initConfig({
 });
 
 grunt.registerTask( "default", [ "lint", "test" ] );
-grunt.registerTask( "lint", [ "jshint", "csslint", "htmllint" ] );
+grunt.registerTask( "lint", [ "asciilint", "jshint", "csslint", "htmllint" ] );
 grunt.registerTask( "test", [ "qunit" ] );
 grunt.registerTask( "sizer", [ "concat:ui", "uglify:main", "compare_size:all" ] );
 grunt.registerTask( "sizer_all", [ "concat:ui", "uglify", "compare_size" ] );

build/tasks/build.js

@@ -135,4 +135,37 @@ grunt.registerTask( "clean", function() {
 	require( "rimraf" ).sync( "dist" );
 });
 
+grunt.registerTask( "asciilint", function() {
+	var valid = true,
+		files = grunt.file.expand({ filter: "isFile" }, "ui/*.js" );
+	files.forEach(function( filename ) {
+		var i, c,
+			text = grunt.file.read( filename );
+
+		// Ensure files use only \n for line endings, not \r\n
+		if ( /\x0d\x0a/.test( text ) ) {
+			grunt.log.error( filename + ": Incorrect line endings (\\r\\n)" );
+			valid = false;
+		}
+
+		// Ensure only ASCII chars so script tags don't need a charset attribute
+		if ( text.length !== Buffer.byteLength( text, "utf8" ) ) {
+			grunt.log.error( filename + ": Non-ASCII characters detected:" );
+			for ( i = 0; i < text.length; i++ ) {
+				c = text.charCodeAt( i );
+				if ( c > 127 ) {
+					grunt.log.error( "- position " + i + ": " + c );
+					grunt.log.error( "-- " + text.substring( i - 20, i + 20 ) );
+					break;
+				}
+			}
+			valid = false;
+		}
+	});
+	if ( valid ) {
+		grunt.log.ok( files.length + " files lint free." );
+	}
+	return valid;
+});
+
 };

build/tasks/testswarm.js

@@ -4,6 +4,7 @@ module.exports = function( grunt ) {
 
 var versions = {
 		"git": "git",
+		"1.10": "1.10.0 1.10.1 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 1.7.1 1.7.2",

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

demos/accordion/no-auto-height.html

@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - No auto height</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
-	<script src="../../jquery-1.9.1.js"></script>
+	<script src="../../jquery-1.10.2.js"></script>
 	<script src="../../ui/jquery.ui.core.js"></script>
 	<script src="../../ui/jquery.ui.widget.js"></script>
 	<script src="../../ui/jquery.ui.accordion.js"></script>

demos/accordion/sortable.html

@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Accordion - Sortable</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
-	<script src="../../jquery-1.9.1.js"></script>
+	<script src="../../jquery-1.10.2.js"></script>
 	<script src="../../ui/jquery.ui.core.js"></script>
 	<script src="../../ui/jquery.ui.widget.js"></script>
 	<script src="../../ui/jquery.ui.mouse.js"></script>