diff options
| author | Jacob Thornton <[email protected]> | 2012-02-16 22:41:02 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-02-16 22:41:02 -0800 |
| commit | 03e6dc66c2fe14e756723395752feefb687b6526 (patch) | |
| tree | b8cfe13d72e1a780ef08dbd26e3bfe48e406c59e /docs/assets/js/bootstrap-alert.js | |
| parent | 9143d8e449a852c606194ea8c529e30ea1a52ddf (diff) | |
| parent | 091622644a0c619e1afbb21041c141da30df76b7 (diff) | |
| download | bootstrap-03e6dc66c2fe14e756723395752feefb687b6526.tar.xz bootstrap-03e6dc66c2fe14e756723395752feefb687b6526.zip | |
Merge branch '2.0.1-wip'
Diffstat (limited to 'docs/assets/js/bootstrap-alert.js')
| -rw-r--r-- | docs/assets/js/bootstrap-alert.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js index 4a65b135a..1d69c5f53 100644 --- a/docs/assets/js/bootstrap-alert.js +++ b/docs/assets/js/bootstrap-alert.js @@ -51,11 +51,14 @@ $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - $parent.removeClass('in') + $parent + .trigger('close') + .removeClass('in') function removeElement() { - $parent.remove() - $parent.trigger('closed') + $parent + .trigger('closed') + .remove() } $.support.transition && $parent.hasClass('fade') ? @@ -88,4 +91,4 @@ $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) }) -}( window.jQuery ) +}( window.jQuery );
\ No newline at end of file |