diff options
| author | Mark Otto <[email protected]> | 2013-12-15 15:07:38 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-15 15:07:38 -0800 |
| commit | d1f15baa713764440e8335b8dbab580887caaa12 (patch) | |
| tree | 22795d45cb61184ae349c66e47352051a2f7ec0b /js | |
| parent | 3b5e0c9a3cae9bfae38253ae153a3426d1f81ad3 (diff) | |
| parent | b04a1de9b097de7f4df95b30df040efe86563e75 (diff) | |
| download | bootstrap-d1f15baa713764440e8335b8dbab580887caaa12.tar.xz bootstrap-d1f15baa713764440e8335b8dbab580887caaa12.zip | |
Merge branch 'master' into pr/11817
Conflicts:
dist/css/bootstrap.min.css
less/input-groups.less
Diffstat (limited to 'js')
| -rw-r--r-- | js/.jscs.json | 2 | ||||
| -rw-r--r-- | js/modal.js | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/js/.jscs.json b/js/.jscs.json index 2f04d9cd6..e02344fd5 100644 --- a/js/.jscs.json +++ b/js/.jscs.json @@ -1,5 +1,5 @@ { - "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return"], + "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"], "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "requireRightStickedOperators": ["!"], diff --git a/js/modal.js b/js/modal.js index 15b81c362..c284b4dc6 100644 --- a/js/modal.js +++ b/js/modal.js @@ -149,7 +149,6 @@ } Modal.prototype.backdrop = function (callback) { - var that = this var animate = this.$element.hasClass('fade') ? 'fade' : '' if (this.isShown && this.options.backdrop) { |