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

[FIX] web_editor: fix colorpicker reverting history

Browse Source 
The colorpickers forcefully reset the current history step to revert the
color change while previewing colors. This works when the only change in
the current step is in fact the colorpicker. If other changes already
existed in the current step however, they will be reverted as well. This
commit fixes the issue by introducing the concept of stashing mutations to
avoid that these be reverted. They can be unstashed later on when the
system is done abusing the revert mechanism.

task-2921844

closes odoo/odoo#97973

X-original-commit: cc280522d590c3ed257e7c6c495008e8986b2bf3
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
Co-authored-by: Nicolas Bayet <nby@odoo.com>
Co-authored-by: David Monjoie <dmo@odoo.com>
This commit is contained in:
David Monjoie
2022-08-11 17:57:34 +02:00
co-authored by Nicolas Bayet
parent 0c22f04354
commit 0755d72433
2 changed files with 26 additions and 0 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
+20
View File
@@ -1172,6 +1172,26 @@ export class OdooEditor extends EventTarget {
historyUnpauseSteps() {
this._historyStepsActive = true;
}
/**
* Stash the mutations of the current step to re-apply them later.
*/
historyStash() {
if (!this._historyStashedMutations) {
this._historyStashedMutations = [];
}
this._historyStashedMutations.push(...this._currentStep.mutations);
this._currentStep.mutations = [];
}
/**
* Unstash the previously stashed mutations into the current step.
*/
historyUnstash() {
if (!this._currentStep.mutations) {
this._currentStep.mutations = [];
}
this._currentStep.mutations.unshift(...this._historyStashedMutations);
this._historyStashedMutations = [];
}
_historyClean() {
this._historySteps = [];
this._currentStep = {
addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
+6
View File
@@ -1523,6 +1523,10 @@ const Wysiwyg = Widget.extend({
const selection = this.odooEditor.document.getSelection();
const range = selection.rangeCount && selection.getRangeAt(0);
const hadNonCollapsedSelection = range && !selection.isCollapsed;
// The color_leave event will revert the mutations with
// `historyRevertCurrentStep`. We must stash the current
// mutations to prevent them from being reverted.
this.odooEditor.historyStash();
colorpicker = new ColorPaletteWidget(this, {
excluded: ['transparent_grayscale'],
$editable: $(this.odooEditor.editable), // Our parent is the root widget, we can't retrieve the editable section from it...
@@ -1535,6 +1539,8 @@ const Wysiwyg = Widget.extend({
if (hadNonCollapsedSelection) {
this.odooEditor.historyResetLatestComputedSelection(true);
}
// Unstash the mutations now that the color is picked.
this.odooEditor.historyUnstash();
this._processAndApplyColor(eventName, ev.data.color);
this._updateEditorUI();
});