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

[FIX] web_editor: remove invisible space on insert media where forbidden

Browse Source 
The web editor inserts zero-width characters (unicode 200B) around media
when inserting them in the DOM so as to be able to edit before and after
said media (contenteditable caveat). It should however not do so in fake
not-editable nodes - such as the navbar - given that we do not expect to
edit in them but only to replace the media. This ensures that behaviour.

closes odoo/odoo#31200
This commit is contained in:
Antoine Guenet
2019-02-18 13:06:17 +00:00
parent fec86404e7
commit 1f4b606ad0
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/wysiwyg/plugin/media.js
+26 -10
View File
@@ -204,11 +204,13 @@ var MediaPlugin = AbstractPlugin.extend({
point.node.insertBefore(newMedia, node || null);
}
}
if (!newMedia.previousSibling) {
$(newMedia).before(this.document.createTextNode('\u200B'), newMedia);
}
if (!newMedia.nextSibling) {
$(newMedia).after(this.document.createTextNode('\u200B'), newMedia);
if (!this._isFakeNotEditable(newMedia)) {
if (!newMedia.previousSibling) {
$(newMedia).before(this.document.createTextNode('\u200B'), newMedia);
}
if (!newMedia.nextSibling) {
$(newMedia).after(this.document.createTextNode('\u200B'), newMedia);
}
}
} else {
var next = this.document.createTextNode(point.node.textContent.slice(point.offset));
@@ -216,11 +218,13 @@ var MediaPlugin = AbstractPlugin.extend({
$(point.node).after(next).after(newMedia);
point.node.parentNode.normalize();
if (!newMedia.previousSibling) {
$(newMedia).before(this.document.createTextNode('\u200B'), newMedia);
}
if (!newMedia.nextSibling) {
$(newMedia).after(this.document.createTextNode('\u200B'), newMedia);
if (!this._isFakeNotEditable(newMedia)) {
if (!newMedia.previousSibling) {
$(newMedia).before(this.document.createTextNode('\u200B'), newMedia);
}
if (!newMedia.nextSibling) {
$(newMedia).after(this.document.createTextNode('\u200B'), newMedia);
}
}
rng = this.context.invoke('editor.setRange', newMedia.nextSibling || newMedia, 0);
rng.normalize().select();
@@ -305,6 +309,18 @@ var MediaPlugin = AbstractPlugin.extend({
});
this._createDropdownButton('padding', this.options.icons.padding, this.lang.image.padding, values);
},
/**
* Return true if the node is a fake not-editable.
*
* @param {Node} node
* @returns {Boolean}
*/
_isFakeNotEditable: function (node) {
var contentEditableAncestor = dom.ancestor(node, function (n) {
return !!n.contentEditable && n.contentEditable !== 'inherit';
});
return !!contentEditableAncestor && contentEditableAncestor.contentEditable === 'false';
},
/**
* Select the target media based on the
* currently saved target or on the current range.