summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/lib
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-11-22 17:06:31 +0100
committerChristophe Simonis <chs@odoo.com>2018-11-22 17:06:31 +0100
commit263b388c5045bebc77cc27847f7500784f63c7f5 (patch)
tree6276eefcf55343781addf209cc37aec6eb25860c /addons/web_editor/static/lib
parent23a7b152762cf5a89fb362cbce41aac85d33cbf5 (diff)
parente44c35f407489ed94033e9fa32e0394b7f42f7e2 (diff)
[MERGE] forward port branch saas-15 up to e44c35f4074
Diffstat (limited to 'addons/web_editor/static/lib')
-rw-r--r--addons/web_editor/static/lib/summernote/src/js/EventHandler.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web_editor/static/lib/summernote/src/js/EventHandler.js b/addons/web_editor/static/lib/summernote/src/js/EventHandler.js
index 578bcfd7a0c..a924e7def8a 100644
--- a/addons/web_editor/static/lib/summernote/src/js/EventHandler.js
+++ b/addons/web_editor/static/lib/summernote/src/js/EventHandler.js
@@ -365,7 +365,7 @@ define([
(keycode > 185 && keycode < 193) || // ;=,-./` (in order)
(keycode > 218 && keycode < 223))) { // [\]' (in order))
eventName = 'visible';
- } else if (!keycode) {
+ } else if (!keycode && event.key !== 'Dead') {
self.invoke('restoreRange', $editable);
}
// ODOO: end_modification)