diff options
author | Felix Nagel <info@felixnagel.com> | 2013-04-21 15:10:38 +0200 |
---|---|---|
committer | Felix Nagel <info@felixnagel.com> | 2013-04-21 15:10:38 +0200 |
commit | 4efd006e26a6cdc3bf78832c0a0832e7301c841b (patch) | |
tree | 5263fe72e9a2784410632d2dee56efd4e58b83f2 /Gruntfile.js | |
parent | 73c7342bc4418a902bf021c89e7d2c43172e004e (diff) | |
parent | 71a332e8b83a1657521e04388f5592997e81bbcc (diff) | |
download | jquery-ui-4efd006e26a6cdc3bf78832c0a0832e7301c841b.tar.gz jquery-ui-4efd006e26a6cdc3bf78832c0a0832e7301c841b.zip |
Merge branch 'master' into selectmenu
Diffstat (limited to 'Gruntfile.js')
-rw-r--r-- | Gruntfile.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index f00343d58..e93df3238 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -74,7 +74,7 @@ var }, main: { options: { - keepSpecialComments: '*' + keepSpecialComments: "*" }, src: "dist/jquery-ui.css", dest: "dist/jquery-ui.min.css" @@ -319,7 +319,7 @@ 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|tabs|tooltip)\.html$/ ).test( file ); + return !( /(all|index|test|dialog|tooltip)\.html$/ ).test( file ); }) }, jshint: { |