diff options
| author | Jacob Thornton <jacobthornton@gmail.com> | 2012-04-16 03:15:32 +0400 |
|---|---|---|
| committer | Jacob Thornton <jacobthornton@gmail.com> | 2012-04-16 03:15:32 +0400 |
| commit | 0b8042656fc52600e18fb1c7f54dbbe8a284e737 (patch) | |
| tree | 65b4da74c6eac862705f1e817d839e29deba52e3 /js | |
| parent | 13e4d1d5ac90484c09ecb1a98e540309d043a6f7 (diff) | |
fixes #2941 + whitespace in collapse
Diffstat (limited to 'js')
| -rw-r--r-- | js/bootstrap-alert.js | 4 | ||||
| -rw-r--r-- | js/bootstrap-collapse.js | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js index 167a57f841..56174955b9 100644 --- a/js/bootstrap-alert.js +++ b/js/bootstrap-alert.js @@ -27,7 +27,7 @@ * ====================== */ var dismiss = '[data-dismiss="alert"]' - , Alert = function ( el ) { + , Alert = function (el) { $(el).on('click', dismiss, this.close) } @@ -68,7 +68,7 @@ /* ALERT PLUGIN DEFINITION * ======================= */ - $.fn.alert = function ( option ) { + $.fn.alert = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('alert') diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 30e139cf89..41e097df31 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -60,6 +60,7 @@ if (actives && actives.length) { hasData = actives.data('collapse') + if (hasData && hasData.transitioning) return actives.collapse('hide') hasData || actives.data('collapse', null) } |