Merge branch 'busticated-linting'

Author: gregjacobs

Gruntfile.js

@@ -48,6 +48,11 @@ module.exports = function(grunt) {
                 src: ['src/Autolinker.js'],
                 dest: 'dist/Autolinker.min.js',
             }
+        },
+        jshint: {
+            files: {
+                src: ['src/**/*.js', 'tests/**/*.js']
+            }
         }
     });
 
@@ -56,9 +61,11 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-jasmine');
     grunt.loadNpmTasks('grunt-contrib-concat');
     grunt.loadNpmTasks('grunt-contrib-uglify');
+    grunt.loadNpmTasks('grunt-contrib-jshint');
 
     // Tasks
-    grunt.registerTask('default', ['test', 'build']);
+    grunt.registerTask('default', ['lint', 'test', 'build']);
+    grunt.registerTask('lint', ['jshint']);
     grunt.registerTask('test', ['jasmine']);
     grunt.registerTask('build', ['concat:development', 'uglify:production']);
     grunt.registerTask('serve', ['connect:server:keepalive']);

package.json

@@ -33,6 +33,7 @@
     "grunt-contrib-connect": "^0.7.1",
     "requirejs": "^2.1.11",
     "grunt-contrib-uglify": "^0.4.0",
-    "grunt-contrib-concat": "^0.4.0"
+    "grunt-contrib-concat": "^0.4.0",
+    "grunt-contrib-jshint": "^0.10.0"
   }
 }

src/Autolinker.js

@@ -1,4 +1,5 @@
 /*global define, module */
+/*jshint smarttabs:true */
 // Set up Autolinker appropriately for the environment.
 ( function( root, factory ) {
 	if( typeof define === 'function' && define.amd ) {