From 49d94d1bab4d1cf142e22af603fde59c5893ecab Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Thu, 7 Jan 2021 17:13:43 +0100 Subject: [PATCH] Simplify formatter selection in Date/Picker.ts --- .../files/js/WoltLabSuite/Core/Date/Picker.js | 13 +++++++++++-- .../files/ts/WoltLabSuite/Core/Date/Picker.ts | 11 +++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js index e5b2960f7f..4b81eed993 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js @@ -577,8 +577,17 @@ define(["require", "exports", "tslib", "../Core", "./Util", "../Dom/Change/Liste } else { element.dataset.value = time.toString(); - const format = isTimeOnly ? "formatTime" : isDateTime ? "formatDateTime" : "formatDate"; - value = DateUtil[format](date); + if (isTimeOnly) { + value = DateUtil.formatTime(date); + } + else { + if (isDateTime) { + value = DateUtil.formatDateTime(date); + } + else { + value = DateUtil.formatDate(date); + } + } } } const isEmpty = value.length === 0; diff --git a/wcfsetup/install/files/ts/WoltLabSuite/Core/Date/Picker.ts b/wcfsetup/install/files/ts/WoltLabSuite/Core/Date/Picker.ts index a8be9494fd..a4fe0b67e0 100644 --- a/wcfsetup/install/files/ts/WoltLabSuite/Core/Date/Picker.ts +++ b/wcfsetup/install/files/ts/WoltLabSuite/Core/Date/Picker.ts @@ -698,8 +698,15 @@ const DatePicker = { value = ""; } else { element.dataset.value = time.toString(); - const format = isTimeOnly ? "formatTime" : isDateTime ? "formatDateTime" : "formatDate"; - value = DateUtil[format](date); + if (isTimeOnly) { + value = DateUtil.formatTime(date); + } else { + if (isDateTime) { + value = DateUtil.formatDateTime(date); + } else { + value = DateUtil.formatDate(date); + } + } } } -- 2.20.1