Merge branch 'master' of github.com:twbs/bootstrap

6 files changed, 32 insertions, 23 deletions

diff --git a/bower.json b/bower.json
index 63616ee39..b29c2702b 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",
     "_*",
-    "docs-assets",
-    "examples",
-    "js/tests",
     "CNAME",
-    "CONTRIBUTING.md",
     "composer.json",
-    "*.html"
+    "CONTRIBUTING.md",
+    "docs-assets",
+    "examples",
+    "js/tests"
   ],
   "dependencies": {
     "jquery": ">= 1.9.0"
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/.jscs.json b/js/.jscs.json
index e8210ccde..c4cac13de 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"
 }
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
diff --git a/package.json b/package.json
index 64f7b5e46..5de55a58f 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
+    }
   }
 }