diff options
| author | Jacob Thornton <[email protected]> | 2012-04-16 15:09:26 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-04-16 15:09:26 -0700 |
| commit | 457859feba3ca9a64a23dd38a4d65e3faad11b04 (patch) | |
| tree | 988a2054ece443f35d3e83f65013288a3eb08753 /js | |
| parent | 498b7d984a8182442e2f543eedff6542c628cd55 (diff) | |
| parent | 5fa0fcc888bdeb5210b03445045ba61bdf7b0034 (diff) | |
| download | bootstrap-457859feba3ca9a64a23dd38a4d65e3faad11b04.tar.xz bootstrap-457859feba3ca9a64a23dd38a4d65e3faad11b04.zip | |
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
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 167a57f84..56174955b 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 30e139cf8..41e097df3 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) } |