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

[FIX] web_editor: image cropping gives traceback

Browse Source 
Before this commit:

The traceback appears after cropping an image and then trying to crop it again.

After this commit:

Cropping an image and then cropping it again won't give us tracebacks anymore.

Task-3134764

closes odoo/odoo#116262

X-original-commit: 83cf218b131c47b711327a224b0a0fd81406e8c3
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
This commit is contained in:
vishal padhiyar
2023-03-23 10:05:50 +01:00
parent f020b58f3f
commit 78b7e9cca9
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
+1 -1
View File
@@ -2461,7 +2461,7 @@ const Wysiwyg = Widget.extend({
this.$editable.find('.o_editable_date_field_linked').removeClass('o_editable_date_field_linked');
}
const closestDialog = e.target.closest('.o_dialog, .o_web_editor_dialog');
if (e.target.closest('.oe-toolbar') || (closestDialog && closestDialog.querySelector('.o_select_media_dialog, .o_link_dialog'))) {
if (e.target.closest('.oe-toolbar') || e.target.closest('.o_we_crop_buttons') || (closestDialog && closestDialog.querySelector('.o_select_media_dialog, .o_link_dialog'))) {
this._shouldDelayBlur = true;
} else {
if (this._pendingBlur && !e.target.closest('.o_wysiwyg_wrapper')) {
addons/web_editor/static/src/scss/wysiwyg.scss
+1
View File
@@ -613,6 +613,7 @@ img.o_we_selected_image {
margin-top: 0.5rem;
display: flex;
flex-wrap: wrap;
bottom: 1rem;
input[type=radio] {
display: none;
addons/web_editor/static/src/xml/wysiwyg.xml
+1 -1
View File
@@ -339,7 +339,7 @@
<div t-name="wysiwyg.widgets.crop" class="o_we_crop_widget" contenteditable="false">
<div class="o_we_cropper_wrapper">
<img class="o_we_cropper_img"/>
<div class="o_we_crop_buttons text-center mt16 position-absolute o_we_no_overlay" contenteditable="false">
<div class="o_we_crop_buttons text-center mt16 position-fixed o_we_no_overlay" contenteditable="false">
<div class="btn-group btn-group-toggle" title="Aspect Ratio" data-bs-toggle="buttons">
<t t-foreach="widget.aspectRatios" t-as="ratio">
<t t-set="is_active" t-value="ratio === widget.aspectRatio"/>