diff --git a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js index ea803919be..c9adeb8d5c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/logviewer/search.controller.js @@ -124,7 +124,6 @@ vm.logOptions.orderDirection = 'Descending'; vm.fromDatePickerConfig = { - pickDate: true, pickTime: true, useSeconds: false, useCurrent: false, @@ -138,7 +137,6 @@ }; vm.toDatePickerConfig = { - pickDate: true, pickTime: true, useSeconds: false, format: "YYYY-MM-DD HH:mm", diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js index 3ec7e191f9..d2787308e8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js @@ -11,7 +11,6 @@ function dateTimePickerController($scope, angularHelper, dateHelper, validationM // setup the default config var config = { - pickDate: true, pickTime: true, useSeconds: true, format: "YYYY-MM-DD HH:mm:ss", @@ -56,7 +55,7 @@ function dateTimePickerController($scope, angularHelper, dateHelper, validationM // Don't show calendar if date format has been set to only time const timeFormat = $scope.model.config.format.toLowerCase(); - const timeFormatPattern = /^h{1,2}:m{1,2}:s{1,2}\s?a?$/gmi; + const timeFormatPattern = /^h{1,2}:m{1,2}(:s{1,2})?\s?a?$/gmi; if (timeFormat.match(timeFormatPattern)) { $scope.datePickerConfig.enableTime = true; $scope.datePickerConfig.noCalendar = true;