pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web_editor: fix traceback when selection is null

Browse Source 
closes odoo/odoo#68827

Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
This commit is contained in:
Sébastien Geelen (sge)
2021-04-06 12:39:47 +00:00
parent 3778e8fc01
commit 7ccc011833
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/editor/snippets.editor.js
+2 -2
View File
@@ -2999,7 +2999,7 @@ var SnippetsMenu = Widget.extend({
_checkEditorToolbarVisibility: function (e) {
const $toolbarContainer = $('#o_we_editor_toolbar_container');
const docSelection = document.getSelection();
const $currentSelectionTarget = docSelection.rangeCount > 0 ? $(docSelection.getRangeAt(0).commonAncestorContainer) : $();
const $currentSelectionTarget = docSelection && docSelection.rangeCount > 0 ? $(docSelection.getRangeAt(0).commonAncestorContainer) : $();
// Do not toggle visibility if the target is inside the toolbar ( eg. during link edition).
if ($currentSelectionTarget.parents('#toolbar').length ||
(e && $(e.target).parents('#toolbar').length)
@@ -3008,7 +3008,7 @@ var SnippetsMenu = Widget.extend({
}
const selection = this.options.wysiwyg.odooEditor.document.getSelection();
const range = selection.rangeCount && selection.getRangeAt(0);
const range = selection && selection.rangeCount && selection.getRangeAt(0);
if (!range ||
!$(range.commonAncestorContainer).parents('#wrapwrap').length ||
$(range.commonAncestorContainer).parent('[data-oe-model]:not([data-oe-type="html"]):not([data-oe-field="arch"])').length