diff options
| author | Martin Trigaux <mat@odoo.com> | 2019-07-23 09:55:56 +0200 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2019-07-23 13:41:00 +0200 |
| commit | e266c7c98a6a4b89c13eb7eb38709cc0251ea47f (patch) | |
| tree | 1b27ca28cac9f1d8577ae2bf14d0682e8920f05f /addons/web/static/src/js/views/view_dialogs.js | |
| parent | 5c705c51cd8377b1c6e1bb2513db34afe48189ee (diff) | |
| parent | 5e4c1b370123dee4e6d6a91cd9582ba41c4d8bd4 (diff) | |
[MERGE] Forward port of 12.0 to saas-12.2 up to 5e4c1b370123dee
Diffstat (limited to 'addons/web/static/src/js/views/view_dialogs.js')
| -rw-r--r-- | addons/web/static/src/js/views/view_dialogs.js | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/addons/web/static/src/js/views/view_dialogs.js b/addons/web/static/src/js/views/view_dialogs.js index befe4247c00..4987f7cc9bc 100644 --- a/addons/web/static/src/js/views/view_dialogs.js +++ b/addons/web/static/src/js/views/view_dialogs.js @@ -241,8 +241,13 @@ var FormViewDialog = ViewDialog.extend({ * @override */ _focusOnClose: function() { - this.trigger_up('form_dialog_discarded'); - return true; + var isFocusSet = false; + this.trigger_up('form_dialog_discarded', { + callback: function (isFocused) { + isFocusSet = isFocused; + }, + }); + return isFocusSet; }, /** @@ -425,8 +430,13 @@ var SelectCreateDialog = ViewDialog.extend({ * @override */ _focusOnClose: function() { - this.trigger_up('form_dialog_discarded'); - return true; + var isFocusSet = false; + this.trigger_up('form_dialog_discarded', { + callback: function (isFocused) { + isFocusSet = isFocused; + }, + }); + return isFocusSet; }, }); |