diff options
| author | Thomas Park <thomas@thomaspark.me> | 2014-11-01 21:05:20 -0400 |
|---|---|---|
| committer | Thomas Park <thomas@thomaspark.me> | 2014-11-01 21:05:20 -0400 |
| commit | 918b2a49ca6ac074bac47f6685cf3a687a4c6212 (patch) | |
| tree | 5d11a2820c6e0726a6ee071724557d12a90c6709 /bower_components/bootstrap/js/alert.js | |
| parent | 5c12c8a99c04fbff7d13e97679121a5de13e01d6 (diff) | |
3.2.0 -> 3.3.0
Diffstat (limited to 'bower_components/bootstrap/js/alert.js')
| -rw-r--r-- | bower_components/bootstrap/js/alert.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bower_components/bootstrap/js/alert.js b/bower_components/bootstrap/js/alert.js index 0efd92cb..d47d85fc 100644 --- a/bower_components/bootstrap/js/alert.js +++ b/bower_components/bootstrap/js/alert.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: alert.js v3.2.0 + * Bootstrap: alert.js v3.3.0 * http://getbootstrap.com/javascript/#alerts * ======================================================================== * Copyright 2011-2014 Twitter, Inc. @@ -18,7 +18,9 @@ $(el).on('click', dismiss, this.close) } - Alert.VERSION = '3.2.0' + Alert.VERSION = '3.3.0' + + Alert.TRANSITION_DURATION = 150 Alert.prototype.close = function (e) { var $this = $(this) @@ -34,7 +36,7 @@ if (e) e.preventDefault() if (!$parent.length) { - $parent = $this.hasClass('alert') ? $this : $this.parent() + $parent = $this.closest('.alert') } $parent.trigger(e = $.Event('close.bs.alert')) @@ -51,7 +53,7 @@ $.support.transition && $parent.hasClass('fade') ? $parent .one('bsTransitionEnd', removeElement) - .emulateTransitionEnd(150) : + .emulateTransitionEnd(Alert.TRANSITION_DURATION) : removeElement() } |