From 6e3ac8f2a466e27939710a8390b6f00e91538197 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 16 Dec 2013 11:36:31 +0200 Subject: [PATCH 1/4] js/.jscs.json: sort by name. --- js/.jscs.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/js/.jscs.json b/js/.jscs.json index e8210ccde8..c4cac13de7 100644 --- a/js/.jscs.json +++ b/js/.jscs.json @@ -1,15 +1,15 @@ { - "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"], - "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, + "disallowKeywords": ["with"], "requireLeftStickedOperators": [","], "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], - "requireRightStickedOperators": ["!"], "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"], "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], - "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], + "requireLineFeedAtFileEnd": true, + "requireRightStickedOperators": ["!"], "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], - "disallowKeywords": ["with"], - "validateLineBreaks": "LF", - "requireLineFeedAtFileEnd": true + "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"], + "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], + "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, + "validateLineBreaks": "LF" } From 29aaf66a8ac3744a62b05dd7534aa6fabed98136 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 17 Dec 2013 14:39:36 +0200 Subject: [PATCH 2/4] Normalize package.json. --- package.json | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 882025622a..c12e035f5b 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,15 @@ "name": "bootstrap", "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.", "version": "3.1.0", - "keywords": ["bootstrap", "css"], + "keywords": [ + "bootstrap", + "css" + ], "homepage": "http://getbootstrap.com", "author": "Twitter, Inc.", - "scripts": { "test": "grunt test" }, + "scripts": { + "test": "grunt test" + }, "repository": { "type": "git", "url": "https://github.com/twbs/bootstrap.git" @@ -43,13 +48,18 @@ }, "jspm": { "main": "js/bootstrap", - "directories": { "lib": "dist" }, + "directories": { + "example": "examples", + "lib": "dist" + }, "shim": { "js/bootstrap": { "imports": "jquery", "exports": "$" } }, - "buildConfig": { "uglify": true } + "buildConfig": { + "uglify": true + } } } From b27fecb7a39cbc27ed3a0e4c30adee1f82aadc14 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 17 Dec 2013 14:41:15 +0200 Subject: [PATCH 3/4] bower.json: sort by name. --- bower.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bower.json b/bower.json index 63616ee39c..b29c2702b5 100644 --- a/bower.json +++ b/bower.json @@ -2,8 +2,8 @@ "name": "bootstrap", "version": "3.1.0", "main": [ - "./dist/js/bootstrap.js", "./dist/css/bootstrap.css", + "./dist/js/bootstrap.js", "./dist/fonts/glyphicons-halflings-regular.eot", "./dist/fonts/glyphicons-halflings-regular.svg", "./dist/fonts/glyphicons-halflings-regular.ttf", @@ -11,14 +11,14 @@ ], "ignore": [ "**/.*", + "*.html", "_*", + "CNAME", + "composer.json", + "CONTRIBUTING.md", "docs-assets", "examples", - "js/tests", - "CNAME", - "CONTRIBUTING.md", - "composer.json", - "*.html" + "js/tests" ], "dependencies": { "jquery": ">= 1.9.0" From a05a11e5dc9fcf86111b4baf61ac6a8e08946d30 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 21 Dec 2013 22:59:40 +0200 Subject: [PATCH 4/4] Get rid of JSHint's `laxcomma` option now that the comma is used on the right side. --- docs-assets/js/application.js | 4 ++-- docs-assets/js/customizer.js | 6 +++--- js/.jshintrc | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docs-assets/js/application.js b/docs-assets/js/application.js index 3fd599eb7b..78eed1ae98 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 cd0f933199..0e32f8090c 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('Ruh roh! Could not parse less files.', err) diff --git a/js/.jshintrc b/js/.jshintrc index c8cccda377..ab4dfdfc98 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