Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

939c9590 · Mark Otto · 7b6f85c1 · 908f4c34 · 939c9590 · 939c9590
Commit 939c9590 authored Jul 27, 2013 by Mark Otto
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

Gruntfile.js Gruntfile.js +3 -0

js/.jshintrc js/.jshintrc +2 -0

No files found.
--- a/Gruntfile.js
+++ b/Gruntfile.js
+/* jshint node: true */
 module.exports = function(grunt) {
+    "use strict";

    // Project configuration.
    grunt.initConfig({
@@ -26,6 +28,7 @@ module.exports = function(grunt) {
        },
        jshint: {
            options: {
+                ignores: [],// HACK: workaround https://github.com/gruntjs/grunt-contrib-jshint/issues/86
                jshintrc: 'js/.jshintrc'
            },
            gruntfile: {

--- a/js/.jshintrc
+++ b/js/.jshintrc
@@ -3,9 +3,11 @@
  "laxcomma" : true,
  "laxbreak" : true,
  "browser"  : true,
+  "eqeqeq"   : false,
  "eqnull"   : true,
  "debug"    : true,
  "devel"    : true,
+  "curly"    : false,
  "boss"     : true,
  "expr"     : true,
  "asi"      : true