diff options
| -rw-r--r-- | addons/web/static/src/js/widgets/date_picker.js | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/addons/web/static/src/js/widgets/date_picker.js b/addons/web/static/src/js/widgets/date_picker.js index 90ec9ed58c6..20171e554a2 100644 --- a/addons/web/static/src/js/widgets/date_picker.js +++ b/addons/web/static/src/js/widgets/date_picker.js @@ -34,6 +34,7 @@ var DateWidget = Widget.extend({ previous: 'fa fa-chevron-left', up: 'fa fa-chevron-up', down: 'fa fa-chevron-down', + close: 'fa fa-times', }, locale : moment.locale(), allowInputToggle: true, @@ -96,16 +97,11 @@ var DateWidget = Widget.extend({ this.picker.date(value); }, - change_datetime: function(e) { + change_datetime: function() { if(this.is_valid()) { this.set_value_from_ui(); this.trigger("datetime_changed"); } - //Close the datetimepicker when a date is selected - //We check only if the date has changed. - if(!e.date.isSame(e.oldDate, 'day')){ - this.picker.hide(); - } }, commit_value: function() { this.change_datetime(); @@ -117,7 +113,13 @@ var DateWidget = Widget.extend({ }); var DateTimeWidget = DateWidget.extend({ - type_of_date: "datetime" + type_of_date: "datetime", + init: function() { + this._super.apply(this, arguments); + this.options = _.defaults(this.options, { + showClose: true, + }); + }, }); return { |