diff options
| author | Mark Otto <[email protected]> | 2013-12-16 00:39:50 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-16 00:39:50 -0800 |
| commit | b6b2c90a7d6c00b54d844e52956334e4a0ab56cc (patch) | |
| tree | 4b93730621a833d93ac161d9507acae647afedb0 /js | |
| parent | 0cb570724dbfb266b363d0e5e27385077976dd65 (diff) | |
| parent | ec261a83a565cfa13d436feebd7a67360a920e9a (diff) | |
| download | bootstrap-b6b2c90a7d6c00b54d844e52956334e4a0ab56cc.tar.xz bootstrap-b6b2c90a7d6c00b54d844e52956334e4a0ab56cc.zip | |
Merge branch 'master' into docs_derp
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) { |