diff options
| author | Mark Otto <[email protected]> | 2013-12-18 10:22:18 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 10:22:18 -0800 |
| commit | 1bc8607bdffe641d58191084b214138a98aba229 (patch) | |
| tree | ffb2855b592ee37c5068da181a4c3fb335a322da /js | |
| parent | 9e38e255343a4fd5fa2fa932c96be9cb5c902337 (diff) | |
| parent | d15218a09ce68d0854d0aa5f5170c1ea859aee31 (diff) | |
| download | bootstrap-1bc8607bdffe641d58191084b214138a98aba229.tar.xz bootstrap-1bc8607bdffe641d58191084b214138a98aba229.zip | |
Merge branch 'master' into css-source-maps
Conflicts:
Gruntfile.js
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) { |