diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-02-04 13:27:22 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-02-04 13:27:22 +0100 |
| commit | 4400cce8201579fc9769b5e2d33829b43bce82d9 (patch) | |
| tree | c507c7dca21bfb0c3bdca8ba57e63a6ab16f230c /addons/web/static/src/js/widgets | |
| parent | ceb05489303dee728c3960a87bf23795efc374c4 (diff) | |
| parent | 4524ad06a8af82ab337fc5aa1d5aa8d8d3024923 (diff) | |
[MERGE] forward port branch saas-12.1 up to 4524ad06a8a
Diffstat (limited to 'addons/web/static/src/js/widgets')
| -rw-r--r-- | addons/web/static/src/js/widgets/auto_complete.js | 5 | ||||
| -rw-r--r-- | addons/web/static/src/js/widgets/data_export.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/widgets/date_picker.js | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/addons/web/static/src/js/widgets/auto_complete.js b/addons/web/static/src/js/widgets/auto_complete.js index a25dc0150f5..33405aa4196 100644 --- a/addons/web/static/src/js/widgets/auto_complete.js +++ b/addons/web/static/src/js/widgets/auto_complete.js @@ -55,7 +55,10 @@ return Widget.extend({ } }); this.$input.on('keypress', function (ev) { - self.search_string = self.search_string + String.fromCharCode(ev.which); + if (ev.which > 31 && ev.which !== 127) { + // we filter control character out of the search string + self.search_string = self.search_string + String.fromCharCode(ev.which); + } if (self.search_string.length) { self.searching = true; var search_string = self.search_string; diff --git a/addons/web/static/src/js/widgets/data_export.js b/addons/web/static/src/js/widgets/data_export.js index d05bf2d33fc..347769b4042 100644 --- a/addons/web/static/src/js/widgets/data_export.js +++ b/addons/web/static/src/js/widgets/data_export.js @@ -311,7 +311,7 @@ var DataExport = Dialog.extend({ }); self.$export_format_inputs = $fmts.find('input'); - self.$export_format_inputs.first().prop('checked', true); + self.$export_format_inputs.filter(':enabled').first().prop('checked', true); } }, show_exports_list: function() { diff --git a/addons/web/static/src/js/widgets/date_picker.js b/addons/web/static/src/js/widgets/date_picker.js index b677abe377a..367ab23178d 100644 --- a/addons/web/static/src/js/widgets/date_picker.js +++ b/addons/web/static/src/js/widgets/date_picker.js @@ -25,6 +25,7 @@ var DateWidget = Widget.extend({ this.name = parent.name; this.options = _.extend({ + locale: moment.locale(), format : this.type_of_date === 'datetime' ? time.getLangDatetimeFormat() : time.getLangDateFormat(), minDate: moment({ y: 1900 }), maxDate: moment().add(200, "y"), |