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 /dist/js/bootstrap.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 'dist/js/bootstrap.js')
| -rw-r--r-- | dist/js/bootstrap.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index dfa3d4e24..d469f22c0 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -982,7 +982,6 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" } Modal.prototype.backdrop = function (callback) { - var that = this var animate = this.$element.hasClass('fade') ? 'fade' : '' if (this.isShown && this.options.backdrop) { |