[MERGE] forward port branch 11.0 up to b05e4d5f95

2018-06-15 10:15:27 +02:00
parent a3c9c286cc b05e4d5f95
commit b170a753e1
38 changed files with 292 additions and 97 deletions
@@ -482,7 +482,13 @@ var FieldDate = InputField.extend({
     * @private
     */
    _makeDatePicker: function () {
-        return new datepicker.DateWidget(this, {defaultDate: this.value});
+        return new datepicker.DateWidget(
+            this,
+            _.defaults(
+                this.nodeOptions.datepicker || {},
+                {defaultDate: this.value}
+            )
+        );
    },

    /**