aboutsummaryrefslogtreecommitdiff
path: root/dist/js/bootstrap.js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-15 11:16:57 -0800
committerMark Otto <[email protected]>2013-12-15 11:16:57 -0800
commitfd62247bf8bbb1bce072f5ee03e996dfc4abed94 (patch)
tree487766325e03d40c7af16c58873b70d8638a72ba /dist/js/bootstrap.js
parentfbf31f965e27a6665c7e0f2d97eb74c0df7585d4 (diff)
parent2b86e05a6150ef13905519070ea82ce895fbae85 (diff)
downloadbootstrap-fd62247bf8bbb1bce072f5ee03e996dfc4abed94.tar.xz
bootstrap-fd62247bf8bbb1bce072f5ee03e996dfc4abed94.zip
Merge branch 'master' into cover_template
Diffstat (limited to 'dist/js/bootstrap.js')
-rw-r--r--dist/js/bootstrap.js1
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) {