diff --git a/.editorconfig b/.editorconfig index 7dd83491ed..c94db9a8ef 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,13 +1,11 @@ -; This file is for unifying the coding style for different editors and IDEs. -; More information at http://EditorConfig.org +# This file is for unifying the coding style for different editors and IDEs +# editorconfig.org root = true -[grunt.js] -indent_style = tab - -[ui/**.js] -indent_style = tab - -[tests/unit/**.js] +[*] indent_style = tab +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/AUTHORS.txt b/AUTHORS.txt index 194d5cb604..09ff072112 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -200,3 +200,6 @@ Karl Swedberg Baoju Yuan Maciej Mroziński Luis Dalmolin +Mark Aaron Shirley +Martin Hoch +Jiayi Yang diff --git a/build/release/release.js b/build/release/release.js index 27759d4d26..401f2366e5 100644 --- a/build/release/release.js +++ b/build/release/release.js @@ -130,6 +130,7 @@ function buildRelease() { echo( "Updating package.json..." ); pkg = readPackage(); pkg.version = newVersion; + pkg.author.url = pkg.author.url.replace( "master", newVersion ); pkg.licenses.forEach(function( license ) { license.url = license.url.replace( "master", newVersion ); }); diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js index 29dd74b874..46f152e7f4 100644 --- a/build/tasks/testswarm.js +++ b/build/tasks/testswarm.js @@ -3,6 +3,7 @@ module.exports = function( grunt ) { var versions = { "git": "git", + "1.8": "1.8.0", "1.7": "1.7 1.7.1 1.7.2", "1.6": "1.6 1.6.1 1.6.2 1.6.3 1.6.4" }, diff --git a/demos/accordion/collapsible.html b/demos/accordion/collapsible.html index e2e2d52a04..c348dfbbfb 100644 --- a/demos/accordion/collapsible.html +++ b/demos/accordion/collapsible.html @@ -4,7 +4,7 @@ jQuery UI Accordion - Collapse content - + diff --git a/demos/accordion/custom-icons.html b/demos/accordion/custom-icons.html index 02344bd125..83f3060efa 100644 --- a/demos/accordion/custom-icons.html +++ b/demos/accordion/custom-icons.html @@ -4,7 +4,7 @@ jQuery UI Accordion - Customize icons - + diff --git a/demos/accordion/default.html b/demos/accordion/default.html index 681fbdcaf9..a50270b27a 100644 --- a/demos/accordion/default.html +++ b/demos/accordion/default.html @@ -4,7 +4,7 @@ jQuery UI Accordion - Default functionality - + diff --git a/demos/accordion/fillspace.html b/demos/accordion/fillspace.html index ca2c5a0eb9..f2e936ec06 100644 --- a/demos/accordion/fillspace.html +++ b/demos/accordion/fillspace.html @@ -4,7 +4,7 @@ jQuery UI Accordion - Fill space - + diff --git a/demos/accordion/hoverintent.html b/demos/accordion/hoverintent.html index a70987fff5..65ca6f09f8 100644 --- a/demos/accordion/hoverintent.html +++ b/demos/accordion/hoverintent.html @@ -4,7 +4,7 @@ jQuery UI Accordion - Open on hoverintent - + diff --git a/demos/accordion/no-auto-height.html b/demos/accordion/no-auto-height.html index ab789f65dc..1773f1beea 100644 --- a/demos/accordion/no-auto-height.html +++ b/demos/accordion/no-auto-height.html @@ -4,7 +4,7 @@ jQuery UI Accordion - No auto height - + diff --git a/demos/accordion/sortable.html b/demos/accordion/sortable.html index fda6ae7ca1..415d7a8180 100644 --- a/demos/accordion/sortable.html +++ b/demos/accordion/sortable.html @@ -4,7 +4,7 @@ jQuery UI Accordion - Sortable - + diff --git a/demos/addClass/default.html b/demos/addClass/default.html index 9d4b714551..6d003d819b 100644 --- a/demos/addClass/default.html +++ b/demos/addClass/default.html @@ -4,7 +4,7 @@ jQuery UI Effects - addClass demo - + + diff --git a/demos/progressbar/animated.html b/demos/progressbar/animated.html index 6134a8ca72..144558e089 100644 --- a/demos/progressbar/animated.html +++ b/demos/progressbar/animated.html @@ -4,7 +4,7 @@ jQuery UI Progressbar - Animated - + diff --git a/demos/progressbar/default.html b/demos/progressbar/default.html index 0f0d692cd5..f1d600c4cd 100644 --- a/demos/progressbar/default.html +++ b/demos/progressbar/default.html @@ -4,7 +4,7 @@ jQuery UI Progressbar - Default functionality - + diff --git a/demos/progressbar/resize.html b/demos/progressbar/resize.html index 7452075f58..6b7960b8d7 100644 --- a/demos/progressbar/resize.html +++ b/demos/progressbar/resize.html @@ -4,7 +4,7 @@ jQuery UI Progressbar - Resizable - + diff --git a/demos/removeClass/default.html b/demos/removeClass/default.html index 61d90363ac..6fcaac4717 100644 --- a/demos/removeClass/default.html +++ b/demos/removeClass/default.html @@ -4,7 +4,7 @@ jQuery UI Effects - removeClass Demo - +