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

[FIX] web_editor: prevent editing non editable media

Browse Source 
Prior to this fix it was possible to edit a media that was not editable
because no check existed for such a thing.

task-2962912

closes odoo/odoo#103035

X-original-commit: ddade4346347266b7f699d05865578dc96e2bf98
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Signed-off-by: Antoine Guenet (age) <age@odoo.com>
This commit is contained in:
Antoine Guenet
2022-10-11 14:10:19 +02:00
parent 7718fe9508
commit dc18de099e
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
+15 -12
View File
@@ -285,20 +285,22 @@ const Wysiwyg = Widget.extend({
this.$editable.on('click', '.o_image, .media_iframe_video', e => e.preventDefault());
this.showTooltip = true;
this.$editable.on('dblclick', mediaSelector, function () {
self.showTooltip = false;
if (this.isContentEditable || (this.parentElement && this.parentElement.isContentEditable)) {
self.showTooltip = false;
const selection = self.odooEditor.document.getSelection();
const anchorNode = selection.anchorNode;
if (anchorNode && closestElement(anchorNode, '.oe-blackbox')) {
return;
}
const selection = self.odooEditor.document.getSelection();
const anchorNode = selection.anchorNode;
if (anchorNode && closestElement(anchorNode, '.oe-blackbox')) {
return;
}
const $el = $(this);
let params = {node: this};
$el.selectElement();
const $el = $(this);
let params = {node: this};
$el.selectElement();
if (!$el.parent().hasClass('o_stars')) {
self.openMediaDialog(params);
if (!$el.parent().hasClass('o_stars')) {
self.openMediaDialog(params);
}
}
});
@@ -1762,7 +1764,8 @@ const Wysiwyg = Widget.extend({
this.toolbar.$el.find('#mediaParagraphDropdownButton').attr('id', 'paragraphDropdownButton');
// 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');
const isInMedia = $target.is(mediaSelector) && !$target.parent().hasClass('o_stars') && e.target &&
(e.target.isContentEditable || (e.target.parentElement && e.target.parentElement.isContentEditable));
this.toolbar.$el.find([
'#image-shape',
'#image-width',