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

[FIX] web_editor: issue with copy paste

Browse Source 
Before this commit:

When attempting to copy a button that is a direct child of a div tag, the div
was unintentionally copied along with the button, leading to additional space
upon pasting, along with the background color.

After this commit:

Now, only the button will be copied and pasted

task-3764652

closes odoo/odoo#158975

X-original-commit: b27b9ca18da9b1c39906f8a374418105c2e9c487
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
This commit is contained in:
dhba
2024-03-26 08:20:20 +00:00
parent 8dd03a3059
commit a42ca8f3ba
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/editor/odoo-editor/src/OdooEditor.js
+13 -3
View File
@@ -3899,9 +3899,13 @@ export class OdooEditor extends EventTarget {
const ancestorsList = [commonAncestorElement, ...ancestors(commonAncestorElement, blockEl)];
// Wrap rangeContent with clones of their ancestors to keep the styles.
for (const ancestor of ancestorsList) {
const clone = ancestor.cloneNode();
clone.append(...rangeContent.childNodes);
rangeContent.appendChild(clone);
// Keep the formatting by keeping inline ancestors and paragraph
// related ones like headings etc.
if (!isBlock(ancestor) || paragraphRelatedElements.includes(ancestor.nodeName)) {
const clone = ancestor.cloneNode();
clone.append(...rangeContent.childNodes);
rangeContent.appendChild(clone);
}
}
}
const dataHtmlElement = document.createElement('data');
@@ -4928,6 +4932,12 @@ export class OdooEditor extends EventTarget {
this._applyCommand("insert", text);
} else if (odooEditorHtml) {
const fragment = parseHTML(this.document, odooEditorHtml);
const selector = this.options.renderingClasses.map(c => `.${c}`).join(',');
if (selector) {
for (const element of fragment.querySelectorAll(selector)) {
element.classList.remove(...this.options.renderingClasses);
}
}
// Instantiate DOMPurify with the correct window.
this.DOMPurify ??= DOMPurify(this.document.defaultView);
this.DOMPurify.sanitize(fragment, { IN_PLACE: true });
addons/web_editor/static/src/js/editor/odoo-editor/test/spec/copyPaste.test.js
+6 -6
View File
@@ -100,8 +100,8 @@ describe('Copy', () => {
const clipboardData = new DataTransfer();
triggerEvent(editor.editable, 'copy', { clipboardData });
window.chai.expect(clipboardData.getData('text/plain')).to.be.equal('First');
window.chai.expect(clipboardData.getData('text/html')).to.be.equal('<li>First</li>');
window.chai.expect(clipboardData.getData('text/odoo-editor')).to.be.equal('<li>First</li>');
window.chai.expect(clipboardData.getData('text/html')).to.be.equal('First');
window.chai.expect(clipboardData.getData('text/odoo-editor')).to.be.equal('First');
},
});
await testEditor(BasicEditor, {
@@ -110,8 +110,8 @@ describe('Copy', () => {
const clipboardData = new DataTransfer();
triggerEvent(editor.editable, 'copy', { clipboardData });
window.chai.expect(clipboardData.getData('text/plain')).to.be.equal('List');
window.chai.expect(clipboardData.getData('text/html')).to.be.equal('<li>List</li>');
window.chai.expect(clipboardData.getData('text/odoo-editor')).to.be.equal('<li>List</li>');
window.chai.expect(clipboardData.getData('text/html')).to.be.equal('List');
window.chai.expect(clipboardData.getData('text/odoo-editor')).to.be.equal('List');
},
});
await testEditor(BasicEditor, {
@@ -120,8 +120,8 @@ describe('Copy', () => {
const clipboardData = new DataTransfer();
triggerEvent(editor.editable, 'copy', { clipboardData });
window.chai.expect(clipboardData.getData('text/plain')).to.be.equal('First');
window.chai.expect(clipboardData.getData('text/html')).to.be.equal('<li><span style="font-size: 48px;"><font style="color: rgb(255, 0, 0);">First</font></span></li>');
window.chai.expect(clipboardData.getData('text/odoo-editor')).to.be.equal('<li><span style="font-size: 48px;"><font style="color: rgb(255, 0, 0);">First</font></span></li>');
window.chai.expect(clipboardData.getData('text/html')).to.be.equal('<span style="font-size: 48px;"><font style="color: rgb(255, 0, 0);">First</font></span>');
window.chai.expect(clipboardData.getData('text/odoo-editor')).to.be.equal('<span style="font-size: 48px;"><font style="color: rgb(255, 0, 0);">First</font></span>');
},
});
})