diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-08-31 19:57:20 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-08-31 19:57:20 +0200 |
| commit | 044c0625ad4644ae7abb197433309822eccdbcdc (patch) | |
| tree | 82b63128bb463a893037e5d4ddd3581d839090e0 /addons/web_editor/static/src/js/summernote.js | |
| parent | bd30f262ebfc1d586d4b5d96a89a56527ef6c375 (diff) | |
| parent | 7faf72c0242353bf3049e7ded9074437ae1d7e82 (diff) | |
[MERGE] forward port of branch saas-6 up to 7faf72c
Diffstat (limited to 'addons/web_editor/static/src/js/summernote.js')
| -rw-r--r-- | addons/web_editor/static/src/js/summernote.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/addons/web_editor/static/src/js/summernote.js b/addons/web_editor/static/src/js/summernote.js index 3ce90c14496..d300f8b28ca 100644 --- a/addons/web_editor/static/src/js/summernote.js +++ b/addons/web_editor/static/src/js/summernote.js @@ -946,8 +946,7 @@ options.keyMap.pc['ESCAPE'] = 'cancel'; options.keyMap.mac['SHIFT+TAB'] = 'untab'; options.keyMap.mac['BACKSPACE'] = 'backspace'; -options.keyMap.mac['CMD+BACKSPACE'] = 'delete'; -options.keyMap.mac['SHIFT+BACKSPACE'] = 'delete'; +options.keyMap.mac['DELETE'] = 'delete'; options.keyMap.mac['ENTER'] = 'enter'; options.keyMap.mac['ESCAPE'] = 'cancel'; @@ -1816,7 +1815,6 @@ eventHandler.toolbar.button.updateRecentColor = function (elBtn, sEvent, sValue) font.style.backgroundColor = sValue !== 'inherit' ? sValue : ""; } } - event.preventDefault(); return false; }; |