diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-08-24 18:19:19 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-08-24 18:19:19 +0200 |
| commit | 88c0ce0692ccf3b1302e15c4ebe34dbf2040be40 (patch) | |
| tree | 5bb1749f69f96df22a92a747052dc2965e83430e /addons/web_editor/static/src/js/editor.js | |
| parent | 878c3c9291ad69b530d24227cb25b38dbf10229b (diff) | |
| parent | e16d495d8965522d90ddf5d5da234b1650a695f9 (diff) | |
[MERGE] forward port of branch saas-6 up to e16d495
Diffstat (limited to 'addons/web_editor/static/src/js/editor.js')
| -rw-r--r-- | addons/web_editor/static/src/js/editor.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/addons/web_editor/static/src/js/editor.js b/addons/web_editor/static/src/js/editor.js index f9255716697..4480101bf6a 100644 --- a/addons/web_editor/static/src/js/editor.js +++ b/addons/web_editor/static/src/js/editor.js @@ -144,6 +144,8 @@ editor.Class = Widget.extend({ d.resolve(); }).on('hidden.bs.modal', function () { d.reject(); + }).on('keydown.dismiss.bs.modal', function (event) { + event.stopImmediatePropagation(); }); d.always(function () { $dialog.remove(); |