vendor/assets/javascripts/alert.js in flashgrid-2.2.6 vs vendor/assets/javascripts/alert.js in flashgrid-2.3.0
- old
+ new
@@ -9,10 +9,12 @@
$(el).on('click', dismiss, this.close)
}
Alert.VERSION = '3.2.0'
+ Alert.TRANSITION_DURATION = 150
+
Alert.prototype.close = function (e) {
var $this = $(this)
var selector = $this.attr('data-target')
if (!selector) {
@@ -23,11 +25,11 @@
var $parent = $(selector)
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'))
if (e.isDefaultPrevented()) return
@@ -40,10 +42,10 @@
}
$.support.transition && $parent.hasClass('fade') ?
$parent
.one('bsTransitionEnd', removeElement)
- .emulateTransitionEnd(150) :
+ .emulateTransitionEnd(Alert.TRANSITION_DURATION) :
removeElement()
}
// ALERT PLUGIN DEFINITION
\ No newline at end of file