summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/lib
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-11-22 15:03:01 +0100
committerChristophe Simonis <chs@odoo.com>2018-11-22 15:03:01 +0100
commite44c35f407489ed94033e9fa32e0394b7f42f7e2 (patch)
tree51ccf9d1ea9124f636479357bb7aa7f22d98bece /addons/web_editor/static/lib
parent7b8c415fc5759e492b6d8f8d51708496b83a0d47 (diff)
parenta9752d3ad39e4ccec88247510a0d21a2f64692f1 (diff)
[MERGE] forward port branch saas-14 up to a9752d3ad39
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 09a7b00082a..1cb9cd8e1c7 100644
--- a/addons/web_editor/static/lib/summernote/src/js/EventHandler.js
+++ b/addons/web_editor/static/lib/summernote/src/js/EventHandler.js
@@ -361,7 +361,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)