From 02fafca0ef163964b8696340d609fca9bbfbfb02 Mon Sep 17 00:00:00 2001
From: Doug Fritz <dougfritz@google.com>
Date: Thu, 4 Sep 2014 16:53:27 -0700
Subject: [PATCH] update linting

---
 .jscsrc     | 1 +
 gulpfile.js | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.jscsrc b/.jscsrc
index 0a13d61..620345b 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -10,6 +10,7 @@
   "disallowKeywords": ["with"],
   "disallowSpacesInsideObjectBrackets": null,
   "disallowImplicitTypeConversion": ["string"],
+  "disallowMultipleVarDecl": null,
 
   "safeContextKeyword": "_this",
 
diff --git a/gulpfile.js b/gulpfile.js
index 9440aa4..13f57d1 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -7,7 +7,7 @@ var gulp = require('gulp'),
     browserSync = require('browser-sync'),
     reload = browserSync.reload;
 
-gulp.task('default', ['docs', 'build']);
+gulp.task('default', ['docs', 'build'])
 
 gulp.task('watch', ['default'], function() {
 
@@ -54,14 +54,16 @@ gulp.task('jscs', function() {
     .pipe($.jscs());
 });
 
-gulp.task('lint', function() {
+gulp.task('jshint', function() {
   return gulp.src('elements/**/*.js')
     .pipe(reload({stream: true, once: true}))
-    .pipe($.jshint())
+    .pipe($.jshint('.jshintrc'))
     .pipe($.jshint.reporter('jshint-stylish'))
     .pipe($.if(!browserSync.active, $.jshint.reporter('fail')));
 });
 
+gulp.task('lint', ['jscs', 'jshint']);
+
 gulp.task('css', function() {
 
   return css('elements/**/*.styl', 'elements');