yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V8: Date pickers - parsing non-standard formats (#6001)

Browse Source
This commit is contained in:
Steve Megson
2020-01-10 08:34:23 +00:00
committed by Sebastiaan Janssen
parent 1cd30aae99
commit 16faeb1886
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
View File

@@ -85,13 +85,27 @@ function dateTimePickerController($scope, angularHelper, dateHelper, validationM
};
$scope.datePickerChange = function(date) {
setDate(date);
const momentDate = moment(date);
setDate(momentDate);
setDatePickerVal();
};
$scope.inputChanged = function() {
setDate($scope.model.datetimePickerValue);
setDatePickerVal();
$scope.inputChanged = function () {
if ($scope.model.datetimePickerValue === "" && $scope.hasDatetimePickerValue) {
// $scope.hasDatetimePickerValue indicates that we had a value before the input was changed,
// but now the input is empty.
$scope.clearDate();
} else if ($scope.model.datetimePickerValue) {
var momentDate = moment($scope.model.datetimePickerValue, $scope.model.config.format, true);
if (!momentDate || !momentDate.isValid()) {
momentDate = moment(new Date($scope.model.datetimePickerValue));
}
if (momentDate && momentDate.isValid()) {
setDate(momentDate);
}
setDatePickerVal();
flatPickr.setDate($scope.model.value, false);
}
}
//here we declare a special method which will be called whenever the value has changed from the server
@@ -103,15 +117,14 @@ function dateTimePickerController($scope, angularHelper, dateHelper, validationM
var newDate = moment(newVal);
if (newDate.isAfter(minDate)) {
setDate(newVal);
setDate(newDate);
} else {
$scope.clearDate();
}
}
};
function setDate(date) {
const momentDate = moment(date);
function setDate(momentDate) {
angularHelper.safeApply($scope, function() {
// when a date is changed, update the model
if (momentDate && momentDate.isValid()) {
@@ -123,12 +136,11 @@ function dateTimePickerController($scope, angularHelper, dateHelper, validationM
$scope.hasDatetimePickerValue = false;
$scope.model.datetimePickerValue = null;
}
updateModelValue(date);
updateModelValue(momentDate);
});
}
function updateModelValue(date) {
const momentDate = moment(date);
function updateModelValue(momentDate) {
if ($scope.hasDatetimePickerValue) {
if ($scope.model.config.pickTime) {
//check if we are supposed to offset the time