diff options
| author | fja-odoo <fja@odoo.com> | 2019-06-11 16:23:21 +0000 |
|---|---|---|
| committer | fja-odoo <fja@odoo.com> | 2019-06-19 14:55:30 +0000 |
| commit | 514ecd75630427ce3168903fc6f6941b33fed8a9 (patch) | |
| tree | 30ea795a23b3a90aac0d122684064d7740c19d9c /addons/web_editor/static/src | |
| parent | 195b71e4f20eaf020caa9a0be3a877c08da7bcd7 (diff) | |
[FIX] web_editor: fix closing optimize image modal
The optimize modal was adding images to the modal even when closing
without optimizing the image.
Now when we close the modal, no images is append to it, same if we
click on "Keep Original" while optimizing an already existing image.
Part of #33983
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
Diffstat (limited to 'addons/web_editor/static/src')
| -rw-r--r-- | addons/web_editor/static/src/js/wysiwyg/widgets/image_optimize_dialog.js | 4 | ||||
| -rw-r--r-- | addons/web_editor/static/src/js/wysiwyg/widgets/media.js | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/addons/web_editor/static/src/js/wysiwyg/widgets/image_optimize_dialog.js b/addons/web_editor/static/src/js/wysiwyg/widgets/image_optimize_dialog.js index 4ba7fbf4350..ef6222f223d 100644 --- a/addons/web_editor/static/src/js/wysiwyg/widgets/image_optimize_dialog.js +++ b/addons/web_editor/static/src/js/wysiwyg/widgets/image_optimize_dialog.js @@ -216,7 +216,9 @@ var ImageOptimizeDialog = Dialog.extend({ * @private */ _onKeepOriginalClick: function () { - this.trigger_up('attachment_updated', this.attachment); + if (!this.isExisting) { + this.trigger_up('attachment_updated', this.attachment); + } this.close(); }, /** diff --git a/addons/web_editor/static/src/js/wysiwyg/widgets/media.js b/addons/web_editor/static/src/js/wysiwyg/widgets/media.js index 44f34ee7035..3f808964beb 100644 --- a/addons/web_editor/static/src/js/wysiwyg/widgets/media.js +++ b/addons/web_editor/static/src/js/wysiwyg/widgets/media.js @@ -390,7 +390,11 @@ var FileWidget = SearchableMediaWidget.extend({ }); optimizeDialog.on('closed', self, function () { self.noSave = true; - resolve(attachment); + if (isExisting) { + reject(); + } else { + resolve(attachment); + } }); }); var always = function () { |
