diff options
| author | Mark Otto <[email protected]> | 2012-04-15 16:48:26 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-04-15 16:48:26 -0700 |
| commit | b67a2d8a59198528aec81a0c50d36aa371e10a9f (patch) | |
| tree | a1f072a89dbe5005f951373f22da8be1e4b7b682 /docs | |
| parent | d374fe92e57cc75fa3bc1e664b96ed7f2191c7e0 (diff) | |
| parent | 0b8042656fc52600e18fb1c7f54dbbe8a284e737 (diff) | |
| download | bootstrap-b67a2d8a59198528aec81a0c50d36aa371e10a9f.tar.xz bootstrap-b67a2d8a59198528aec81a0c50d36aa371e10a9f.zip | |
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/js/bootstrap-alert.js | 4 | ||||
| -rw-r--r-- | docs/assets/js/bootstrap-collapse.js | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js index 167a57f84..56174955b 100644 --- a/docs/assets/js/bootstrap-alert.js +++ b/docs/assets/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/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js index 30e139cf8..41e097df3 100644 --- a/docs/assets/js/bootstrap-collapse.js +++ b/docs/assets/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) } |