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

[FIX] web_editor: properly hide link tools on selection over blocks

Browse Source 
When the user selects across several blocks, the link tools are supposed
to be hidden. This was however broken due to other mechanisms restoring
it after it got hidden.

task-2856858

Part-of: odoo/odoo#91314
This commit is contained in:
Antoine Guenet
2022-05-24 14:51:06 +02:00
parent 9be73fd087
commit 64fb91ec01
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
+9 -7
View File
@@ -290,7 +290,7 @@ const Wysiwyg = Widget.extend({
// _createPalette.
this._configureToolbar(options);
$(this.odooEditor.editable).on('click', this._updateEditorUI.bind(this));
$(this.odooEditor.editable).on('mouseup', this._updateEditorUI.bind(this));
$(this.odooEditor.editable).on('keydown', this._updateEditorUI.bind(this));
$(this.odooEditor.editable).on('keydown', this._handleShortcuts.bind(this));
// Ensure the Toolbar always have the correct layout in note.
@@ -1583,12 +1583,6 @@ const Wysiwyg = Widget.extend({
const $target = e ? editorWindow.$(e.target) : editorWindow.$();
// Restore paragraph dropdown button's default ID.
this.toolbar.$el.find('#mediaParagraphDropdownButton').attr('id', 'paragraphDropdownButton');
// Hide the create-link button if the selection spans several blocks.
const selection = this.odooEditor.document.getSelection();
const range = selection.rangeCount && selection.getRangeAt(0);
const $rangeContainer = range && $(range.commonAncestorContainer);
const spansBlocks = range && !!$rangeContainer.contents().filter((i, node) => isBlock(node)).length;
this.toolbar.$el.find('#create-link').toggleClass('d-none', !range || spansBlocks);
// Only show the media tools in the toolbar if the current selected
// snippet is a media.
const isInMedia = $target.is(mediaSelector) && !$target.parent().hasClass('o_stars');
@@ -1628,6 +1622,14 @@ const Wysiwyg = Widget.extend({
// Some icons are relevant for icons, that aren't for other media.
this.toolbar.$el.find('#colorInputButtonGroup, #create-link').toggleClass('d-none', isInMedia && !$target.is('.fa'));
this.toolbar.$el.find('.only_fa').toggleClass('d-none', !$target.is('.fa'));
// Hide the create-link button if the selection spans several blocks.
const selection = this.odooEditor.document.getSelection();
const range = selection.rangeCount && selection.getRangeAt(0);
const $rangeContainer = range && $(range.commonAncestorContainer);
const spansBlocks = range && !!$rangeContainer.contents().filter((i, node) => isBlock(node)).length;
if (!range || spansBlocks) {
this.toolbar.$el.find('#create-link').toggleClass('d-none', true);
}
// Toggle the toolbar arrow.
this.toolbar.$el.toggleClass('noarrow', isInMedia);
// Unselect all media.
addons/website/static/tests/tours/edit_link_popover.js
+1
View File
@@ -42,6 +42,7 @@ tour.register('edit_link_popover', {
{
content: "Click on a paragraph",
trigger: FIRST_PARAGRAPH,
run: 'text Paragraph', // Make sure the selection is set in the paragraph
},
{
content: "Click on 'Link' to open Link Dialog",