Merge remote-tracking branch 'refs/remotes/origin/3.0'

[GitHub/WoltLab/WCF.git] / wcfsetup / install / files / js / WoltLabSuite / Core / Date / Picker.js

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js
index ce4875486d57585775f425602940978baf78664f..aedf0ece6302aed90a26296c248ff52e2b880998 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js
@@ -90,9 +90,17 @@ define(['DateUtil', 'Language', 'ObjectMap', 'Dom/ChangeListener', 'Ui/Alignment
                                                date = new Date(value);
                                        }
                                        
-                                       elData(element, 'value', date.getTime());
-                                       var format = (isTimeOnly) ? 'formatTime' : ('formatDate' + (isDateTime ? 'Time' : ''));
-                                       value = DateUtil[format](date);
+                                       var time = date.getTime();
+                                       
+                                       // check for invalid dates
+                                       if (isNaN(time)) {
+                                               value = '';
+                                       }
+                                       else {
+                                               elData(element, 'value', time);
+                                               var format = (isTimeOnly) ? 'formatTime' : ('formatDate' + (isDateTime ? 'Time' : ''));
+                                               value = DateUtil[format](date);
+                                       }
                                }
                                
                                var isEmpty = (value.length === 0);