Merge pull request trentrichardson#618 from srvance/dev

Grunt cleanup, lint cleanup

Author: trentrichardson

.jshintrc

@@ -1,15 +1,15 @@
 {
-  "curly": true,
-  "eqeqeq": true,
-  "immed": true,
-  "latedef": true,
-  "newcap": true,
-  "noarg": true,
-  "sub": true,
-  "undef": true,
-  "unused": true,
-  "boss": true,
-  "eqnull": true,
-  "node": true,
-  "es5": true
+	"curly": true,
+	"eqeqeq": true,
+	"immed": true,
+	"latedef": true,
+	"newcap": true,
+	"noarg": true,
+	"sub": true,
+	"undef": true,
+	"unused": true,
+	"boss": true,
+	"eqnull": true,
+	"node": true,
+	"es5": true
 }

Gruntfile.js

@@ -20,7 +20,7 @@ module.exports = function(grunt) {
 				files: [
 					//{ src: 'src/index.html', dest: 'dist/index.html' },
 					{ src: 'src/<%= pkg.name %>.css', dest: 'dist/<%= pkg.name %>.css' },
-					{ src: 'src/i18n/jquery-ui-timepicker-*.js', dest: 'dist/i18n/', expand:true, flatten: true },
+					{ src: 'src/i18n/jquery-ui-timepicker-*.js', dest: 'dist/i18n/', expand:true, flatten: true }
 				]
 			}
 		},
@@ -53,7 +53,7 @@ module.exports = function(grunt) {
 			dist: {
 				src: '<%= concat.dist.dest %>',
 				dest: 'dist/<%= pkg.name %>.min.js'
-			},
+			}
 		},
 		cssmin: {
 			options: {
@@ -62,15 +62,16 @@ module.exports = function(grunt) {
 			dist: {
 				src: 'dist/<%= pkg.name %>.css',
 				dest: 'dist/<%= pkg.name %>.min.css'
-			},
+			}
 		},
 		jasmine: {
 			src: 'src/<%= pkg.name %>.js',
 			options: {
 				specs: 'test/*_spec.js',
 				vendor: [
 						'http://code.jquery.com/jquery-1.10.1.min.js',
-						'http://code.jquery.com/ui/1.10.3/jquery-ui.min.js'
+						'http://code.jquery.com/ui/1.10.3/jquery-ui.min.js',
+						'http://github.com/searls/jasmine-fixture/releases/1.0.5/1737/jasmine-fixture.js'
 					]
 			}
 		},
@@ -92,7 +93,7 @@ module.exports = function(grunt) {
 					jshintrc: 'test/.jshintrc'
 				},
 				src: ['test/**/*.js']
-			},
+			}
 		},
 		watch: {
 			gruntfile: {
@@ -106,8 +107,8 @@ module.exports = function(grunt) {
 			test: {
 				files: '<%= jshint.test.src %>',
 				tasks: ['jshint:test', 'jasmine']
-			},
-		},
+			}
+		}
 	});
 
 	// These plugins provide necessary tasks.

src/.jshintrc

@@ -1,16 +1,16 @@
 {
-  "curly": true,
-  "eqeqeq": true,
-  "immed": true,
-  "latedef": true,
-  "newcap": true,
-  "noarg": true,
-  "sub": true,
-  "undef": true,
-  "unused": false,
-  "loopfunc": true,
-  "boss": true,
-  "eqnull": true,
-  "browser": true,
-  "predef": ["jQuery"]
+	"curly": true,
+	"eqeqeq": true,
+	"immed": true,
+	"latedef": true,
+	"newcap": true,
+	"noarg": true,
+	"sub": true,
+	"undef": true,
+	"unused": false,
+	"loopfunc": true,
+	"boss": true,
+	"eqnull": true,
+	"browser": true,
+	"predef": ["jQuery"]
 }