[MERGE] forward port branch saas-11.3 up to 50860317cc

Note: 1aacc96262 has been ignored and will be forward-ported later
2018-06-15 13:27:27 +02:00
parent 8a03563269 50860317cc
commit 73652a0b19
129 changed files with 1227 additions and 526 deletions
@@ -498,7 +498,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}
+            )
+        );
    },

    /**