[MERGE] forward port branch saas-11.2 up to b170a753e1

2018-06-15 11:30:27 +02:00
parent 42ba1298d8 b170a753e1
commit 50860317cc
130 changed files with 1279 additions and 557 deletions
@@ -491,7 +491,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}
+            )
+        );
    },

    /**