Skip to content

Update alerts to hide the element instead of removing it - like modals #10752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
navarr wants to merge 2 commits into from
Closed

Update alerts to hide the element instead of removing it - like modals #10752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f89fb7e
Update alerts to hide the element instead of removing it - like modals
navarr Sep 21, 2013
ac4b546
Update alert.js test to take into account API change
navarr Sep 21, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions js/alert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@

$parent.removeClass('in')

function removeElement() {
$parent.trigger('closed.bs.alert').remove()
function hideElement() {
$parent.trigger('closed.bs.alert').hide()
}

$.support.transition && $parent.hasClass('fade') ?
$parent
.one($.support.transition.end, removeElement)
.one($.support.transition.end, hideElement)
.emulateTransitionEnd(150) :
removeElement()
hideElement()
}


Expand Down
4 changes: 2 additions & 2 deletions js/tests/unit/alert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ $(function () {
ok(!alert.hasClass('in'), 'remove .in class on .close click')
})

test("should remove element when clicking .close", function () {
test("should hide element when clicking .close", function () {
$.support.transition = false

var alertHTML = '<div class="alert-message warning fade in">'
Expand All @@ -41,7 +41,7 @@ $(function () {

alert.find('.close').click()

ok(!$('#qunit-fixture').find('.alert-message').length, 'element removed from dom')
ok(!$('#qunit-fixture').find('.alert-message').is(':visible'), 'element hidden')
})

test("should not fire closed when close is prevented", function () {
Expand Down