diff options
| author | Chris Rebert <[email protected]> | 2013-09-18 13:15:18 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2013-09-18 13:15:18 -0700 |
| commit | 5deee652f927a0eebfceeea7d0584819bea0f766 (patch) | |
| tree | 4bd28c8a6a299de6569df485dc3bf4298cdee529 | |
| parent | 68099ec2756393f0996056b489a088048d3acc6c (diff) | |
| parent | 3c0489102ee65bcb020a6fd5fc399d9806a46a51 (diff) | |
| download | bootstrap-5deee652f927a0eebfceeea7d0584819bea0f766.tar.xz bootstrap-5deee652f927a0eebfceeea7d0584819bea0f766.zip | |
Merge pull request #10703 from XhmikosR/sort
Sort by name.
| -rw-r--r-- | js/.jshintrc | 16 | ||||
| -rw-r--r-- | package.json | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/js/.jshintrc b/js/.jshintrc index 94c520d5c..fdfdfbbfb 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -1,14 +1,14 @@ { - "validthis": true, - "laxcomma" : true, - "laxbreak" : true, + "asi" : true, + "boss" : true, "browser" : true, - "eqeqeq" : false, - "eqnull" : true, + "curly" : false, "debug" : true, "devel" : true, - "curly" : false, - "boss" : true, + "eqeqeq" : false, + "eqnull" : true, "expr" : true, - "asi" : true + "laxbreak" : true, + "laxcomma" : true, + "validthis": true }
\ No newline at end of file diff --git a/package.json b/package.json index 477dba20e..a9227b558 100644 --- a/package.json +++ b/package.json @@ -22,12 +22,12 @@ , "devDependencies": { "grunt": "~0.4.1" , "grunt-contrib-clean": "~0.5.0" - , "grunt-contrib-connect": "~0.5.0" , "grunt-contrib-concat": "~0.3.0" + , "grunt-contrib-connect": "~0.5.0" , "grunt-contrib-copy": "~0.4.1" , "grunt-contrib-jshint": "~0.6.4" - , "grunt-contrib-uglify": "~0.2.4" , "grunt-contrib-qunit": "~0.2.2" + , "grunt-contrib-uglify": "~0.2.4" , "grunt-contrib-watch": "~0.5.3" , "grunt-html-validation": "~0.1.5" , "grunt-jekyll": "~0.3.9" |