aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <[email protected]>2013-12-21 22:59:40 +0200
committerXhmikosR <[email protected]>2013-12-22 09:02:08 +0200
commita05a11e5dc9fcf86111b4baf61ac6a8e08946d30 (patch)
tree62c0462332038dd0133578d6040e3611cfc522ec
parent5f9695ae7cf66dd7f07a3cb3eb534e838d18c62b (diff)
downloadbootstrap-a05a11e5dc9fcf86111b4baf61ac6a8e08946d30.tar.xz
bootstrap-a05a11e5dc9fcf86111b4baf61ac6a8e08946d30.zip
Get rid of JSHint's `laxcomma` option now that the comma is used on the right side.
-rw-r--r--docs-assets/js/application.js4
-rw-r--r--docs-assets/js/customizer.js6
-rw-r--r--js/.jshintrc1
3 files changed, 5 insertions, 6 deletions
diff --git a/docs-assets/js/application.js b/docs-assets/js/application.js
index 3fd599eb7..78eed1ae9 100644
--- a/docs-assets/js/application.js
+++ b/docs-assets/js/application.js
@@ -59,8 +59,8 @@
var navOuterHeight = $('.bs-docs-nav').height()
return (this.top = offsetTop - navOuterHeight - sideBarMargin)
- }
- , bottom: function () {
+ },
+ bottom: function () {
return (this.bottom = $('.bs-footer').outerHeight(true))
}
}
diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js
index cd0f93319..0e32f8090 100644
--- a/docs-assets/js/customizer.js
+++ b/docs-assets/js/customizer.js
@@ -227,9 +227,9 @@ window.onload = function () { // wait for load in a dumb way because B-0
try {
var parser = new less.Parser({
- paths: ['variables.less', 'mixins.less']
- , optimization: 0
- , filename: 'bootstrap.css'
+ paths: ['variables.less', 'mixins.less'],
+ optimization: 0,
+ filename: 'bootstrap.css'
}).parse(css, function (err, tree) {
if (err) {
return showError('<strong>Ruh roh!</strong> Could not parse less files.', err)
diff --git a/js/.jshintrc b/js/.jshintrc
index c8cccda37..ab4dfdfc9 100644
--- a/js/.jshintrc
+++ b/js/.jshintrc
@@ -9,7 +9,6 @@
"eqnull" : true,
"expr" : true,
"laxbreak" : true,
- "laxcomma" : true,
"quotmark" : "single",
"validthis": true
} \ No newline at end of file