From f7bc317213bab165736f99a38e6ae581052f8f03 Mon Sep 17 00:00:00 2001 From: lubber-de Date: Thu, 4 Oct 2018 16:08:11 +0200 Subject: [PATCH] support true/false/'top'/'bottom' for showProgress parameter. No need to set the proper className for progress anymore --- src/definitions/modules/toast.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/definitions/modules/toast.js b/src/definitions/modules/toast.js index 8dbcdea912..3cae90fc9a 100644 --- a/src/definitions/modules/toast.js +++ b/src/definitions/modules/toast.js @@ -77,7 +77,7 @@ $.fn.toast = function(parameters) { module.bind.events(); if(settings.displayTime > 0) { - module.closeTimer = setTimeout(module.close, settings.displayTime+(settings.showProgress ? 300 : 0)); + module.closeTimer = setTimeout(module.close, settings.displayTime+(!!settings.showProgress ? 300 : 0)); } module.show(); }, @@ -149,10 +149,13 @@ $.fn.toast = function(parameters) { $toastBox.addClass('compact'); } $toast = $toastBox.append($toast); - if(settings.showProgress && settings.displayTime > 0){ + if(!!settings.showProgress && settings.displayTime > 0){ $progress .addClass(settings.class) .append($progressBar); + if(settings.showProgress === 'top' ){ + $progress.removeClass('bottom').addClass('top'); + } if ($progress.hasClass('top')) { $toast.prepend($progress); } else {