From 4db3e7e671361e41dbf6e10d00a15cba8fbd5e3a Mon Sep 17 00:00:00 2001 From: Salih Date: Mon, 20 Feb 2023 22:52:50 +0300 Subject: [PATCH] Refactoring --- .../Form/DatePicker/AbpDatePickerBaseTagHelperService.cs | 2 +- .../bootstrap/dom-event-handlers.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs index 15e81e6c3d..6359e15cbd 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs @@ -356,7 +356,7 @@ public abstract class AbpDatePickerBaseTagHelperService : AbpTagHelp if (options.IsUtc != null) { - attrList.Add("data-is-utc", "true"); + attrList.Add("data-is-utc", options.IsUtc.ToString().ToLowerInvariant()); } if (options.IsIso != null) 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 e47bd840a4..35b19292cc 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 @@ -359,11 +359,11 @@ options.locale.separator = separator; } - var startDate = options.startDate ? getMoment(options.startDate) : null; + var startDate = options.startDate ? moment(options.startDate) : null; if(singleDatePicker && !startDate){ - startDate = options.date ? getMoment(options.date) : null; + startDate = options.date ? moment(options.date) : null; } - var endDate = options.endDate ? getMoment(options.endDate) : null; + var endDate = options.endDate ? moment(options.endDate) : null; if (startDate) { options.startDate = startDate;