From d1fe97342f3b2f8089c8688aaee0a0e0582ae3bb Mon Sep 17 00:00:00 2001 From: Salih Date: Tue, 28 Mar 2023 18:15:38 +0300 Subject: [PATCH] Align clean and apply buttons today --- .../bootstrap/dom-event-handlers.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js index 5418e623e5..8c97539e66 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js @@ -483,12 +483,8 @@ function addExtraButtons(options, $dateRangePicker, $input) { var extraButtons = [getTodayButton(options, $input), getClearButton(options, $input, $dateRangePicker)]; - if ($dateRangePicker.container.find('.drp-buttons').css('display') !== 'none') { - - $.each(extraButtons, function (index, value) { - $dateRangePicker.container.find('.drp-buttons').prepend(value); - }); - } else { + + if ($dateRangePicker.container.hasClass('auto-apply')) { var $div = $('
'); $div.css('display', 'block'); $.each(extraButtons, function (index, value) { @@ -496,6 +492,10 @@ }); $div.insertAfter($dateRangePicker.container.find('.drp-buttons')); + } else { + $.each(extraButtons, function (index, value) { + $dateRangePicker.container.find('.drp-buttons').prepend(value); + }); } }