Skip to content
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

Jump to bottom

Added support for explicitly clearing a toast, which ignores the focus c... #226

Merged
merged 3 commits into from
Jan 20, 2015
Merged

Added support for explicitly clearing a toast, which ignores the focus c... #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e10850
Added support for explicitly clearing a toast, which ignores the focu…
jstawski Dec 12, 2014
d4c246f
remove clearExplicitly and replaced with clear($toast, options);
jstawski Dec 12, 2014
b69e83d
Renamed ignoreFocus to force
jstawski Jan 20, 2015
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
28 changes: 24 additions & 4 deletions demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ <h1>toastr</h1>
<input id="preventDuplicates" type="checkbox" value="checked" class="input-mini" />Prevent Duplicates
</label>
</div>
<div class="controls">
<label class="checkbox" for="addClear">
<input id="addClear" type="checkbox" value="checked" class="input-mini" />Add Clear Button
</label>
</div>
</div>
</div>

Expand Down Expand Up @@ -188,6 +193,12 @@ <h2>Links</h2>

return msgs[i];
};
var getMessageWithClearButton = function (msg) {
msg = msg ? msg : 'Clear itself?';
msg += '<br /><br /><button type="button" class="clear">Yes</button>';
return msg;
};

$('#showtoast').click(function () {
var shortCutFunction = $("#toastTypeGroup input:radio:checked").val();
var msg = $('#message').val();
Expand All @@ -201,6 +212,7 @@ <h2>Links</h2>
var $showMethod = $('#showMethod');
var $hideMethod = $('#hideMethod');
var toastIndex = toastCount++;
var addClear = $('#addClear').prop('checked');

toastr.options = {
closeButton: $('#closeButton').prop('checked'),
Expand All @@ -226,11 +238,11 @@ <h2>Links</h2>
}

if ($timeOut.val().length) {
toastr.options.timeOut = $timeOut.val();
toastr.options.timeOut = addClear ? 0 : $timeOut.val();
}

if ($extendedTimeOut.val().length) {
toastr.options.extendedTimeOut = $extendedTimeOut.val();
toastr.options.extendedTimeOut = addClear ? 0 : $extendedTimeOut.val();
}

if ($showEasing.val().length) {
Expand All @@ -249,8 +261,10 @@ <h2>Links</h2>
toastr.options.hideMethod = $hideMethod.val();
}



if (addClear) {
msg = getMessageWithClearButton(msg);
toastr.options.tapToDismiss = false;
}
if (!msg) {
msg = getMessage();
}
Expand All @@ -277,7 +291,13 @@ <h2>Links</h2>
alert('Surprise! you clicked me. i was toast #' + toastIndex + '. You could perform an action here.');
});
}
if ($toast.find('.clear').length) {
$toast.delegate('.clear', 'click', function () {
toastr.clear($toast, { force: true });
});
}
});

function getLastToast(){
return $toastlast;
}
Expand Down
29 changes: 28 additions & 1 deletion tests/unit/toastr-tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,33 @@
start();
}, delay);
});
test('clear - after clear toast with focus still appears', 1, function () {
//Arrange
var $toast;
var msg = sampleMsg + '<br/><br/><button type="button">Clear</button>';
//Act
$toast = toastr.info(msg, sampleTitle + '-1');
$toast.find('button').focus();
toastr.clear($toast);
//Assert
ok($toast.is(':visible'), 'Focused toast after a clear is visible');
//Teardown
resetContainer();
});
test('clear - after clear with force option toast with focus disappears', 1, function () {
//Arrange
var $toast;
var msg = sampleMsg + '<br/><br/><button type="button">Clear</button>';
//Act
$toast = toastr.info(msg, sampleTitle + '-1');
$toast.find('button').focus();
toastr.clear($toast, { force: true });
var $container = toastr.getContainer();
//Assert
ok($container && $container.children().length === 0, 'Focused toast after a clear with force is not visible');
//Teardown
resetContainer();
});
asyncTest('clear and show - show 2 toasts, clear both, then show 1 more', 2, function () {
//Arrange
var $toast = [];
Expand Down Expand Up @@ -312,7 +339,7 @@
$toast.remove();
clearContainerChildren();
});
test('close button has type=button', 1, function () {
test('close button has type=button', 1, function () {
//Arrange
toastr.options.closeButton = true;
//Act
Expand Down
11 changes: 6 additions & 5 deletions toastr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@
});
}

function clear($toastElement) {
function clear($toastElement, clearOptions) {
var options = getOptions();
if (!$container) { getContainer(options); }
if (!clearToast($toastElement, options)) {
if (!clearToast($toastElement, options, clearOptions)) {
clearContainer(options);
}
}
Expand All @@ -127,8 +127,9 @@
}
}

function clearToast ($toastElement, options) {
if ($toastElement && $(':focus', $toastElement).length === 0) {
function clearToast ($toastElement, options, clearOptions) {
var force = clearOptions && clearOptions.force ? clearOptions.force : false;
if ($toastElement && (force || $(':focus', $toastElement).length === 0)) {
$toastElement[options.hideMethod]({
duration: options.hideDuration,
easing: options.hideEasing,
Expand Down Expand Up @@ -199,7 +200,7 @@
options = $.extend(options, map.optionsOverride);
iconClass = map.optionsOverride.iconClass || iconClass;
}

if (options.preventDuplicates) {
if (map.message === previousToast) {
return;
Expand Down