Merge remote-tracking branch 'origin/1.3' into 1.4

ezsystems · Mar 14, 2019 · 2d7a5b6 · 2d7a5b6
2 parents 2e4261c + 37cb561
commit 2d7a5b6
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezdate.js b/src/bundle/Resources/public/js/scripts/fieldType/ezdate.js
@@ -90,7 +90,14 @@
         const sourceInput = field.querySelector(SELECTOR_INPUT);
         const flatPickrInput = field.querySelector(SELECTOR_FLATPICKR_INPUT);
         const btnClear = field.querySelector('.ez-data-source__btn--clear-input');
-        const defaultDate = sourceInput.value ? new Date(sourceInput.value * 1000) : null;
+        let defaultDate = null;
+
+        if (sourceInput.value) {
+            defaultDate = new Date(sourceInput.value * 1000);
+
+            defaultDate.setTime(defaultDate.getTime() + defaultDate.getTimezoneOffset() * 60 * 1000);
+        }
+
         const flatpickrInstance = flatpickr(
             flatPickrInput,
             Object.assign({}, dateConfig, {