mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-10-01 07:46:47 +02:00
Code Issues Releases Wiki Activity

some minor alert shit

Browse Source
This commit is contained in:
Jacob Thornton
2015-08-18 20:33:57 -07:00
parent 8cfde5ef29
commit fd65b9f32e
24 changed files with 153 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/dist/alert.js vendored
View File

@@ -93,8 +93,8 @@ var Alert = (function ($) {
}, {
key: '_getRootElement',
value: function _getRootElement(element) {
var parent = false;
var selector = Util.getSelectorFromElement(element);
var parent = false;
if (selector) {
parent = $(selector)[0];
@@ -110,6 +110,7 @@ var Alert = (function ($) {
key: '_triggerCloseEvent',
value: function _triggerCloseEvent(element) {
var closeEvent = $.Event(Event.CLOSE);
$(element).trigger(closeEvent);
return closeEvent;
}
@@ -123,7 +124,7 @@ var Alert = (function ($) {
return;
}
$(element).one(Util.TRANSITION_END, this._destroyElement.bind(this, element)).emulateTransitionEnd(TRANSITION_DURATION);
$(element).one(Util.TRANSITION_END, $.proxy(this._destroyElement, this, element)).emulateTransitionEnd(TRANSITION_DURATION);
}
}, {
key: '_destroyElement',