summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfja-odoo <fja@odoo.com>2019-06-11 16:08:38 +0000
committerfja-odoo <fja@odoo.com>2019-06-19 14:55:30 +0000
commit4ebda2ec2be55df3b900747ffb1d60e4b3f70691 (patch)
tree74bba497f862042d05f4e09e29017bf2ae964cc8
parent16ee1966af50e22cc54d4c00747ba6d241f4e4a1 (diff)
[FIX] web_editor, web_unsplash: fix nested div
The div that is replaced with the existing.attachments template was not the right target and kept nesting div into each other. The parent div of the existing.attachments now has the o_we_existing_attachments class (the target to be replaced by itself). Part of #33983
-rw-r--r--addons/web_editor/static/src/js/wysiwyg/widgets/media.js2
-rw-r--r--addons/web_editor/static/src/xml/wysiwyg.xml10
-rw-r--r--addons/web_editor/static/tests/wysiwyg_snippets_tests.js2
-rw-r--r--addons/web_unsplash/static/src/js/unsplash_image_widget.js2
-rw-r--r--addons/web_unsplash/static/src/xml/unsplash_image_widget.xml2
5 files changed, 9 insertions, 9 deletions
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 5a56faea8db..44f34ee7035 100644
--- a/addons/web_editor/static/src/js/wysiwyg/widgets/media.js
+++ b/addons/web_editor/static/src/js/wysiwyg/widgets/media.js
@@ -418,7 +418,7 @@ var FileWidget = SearchableMediaWidget.extend({
var attachments = this.attachments.slice(0, this.numberOfAttachmentsToDisplay);
// Render menu & content
- this.$('.existing-attachments').replaceWith(
+ this.$('.o_we_existing_attachments').replaceWith(
this._renderExisting(attachments)
);
diff --git a/addons/web_editor/static/src/xml/wysiwyg.xml b/addons/web_editor/static/src/xml/wysiwyg.xml
index abd2e940824..75056ec4a1e 100644
--- a/addons/web_editor/static/src/xml/wysiwyg.xml
+++ b/addons/web_editor/static/src/xml/wysiwyg.xml
@@ -98,7 +98,7 @@
<form>
<t t-call="wysiwyg.widgets.files.submenu"/>
<div class="form-text o_we_error_text"/>
- <div class="existing-attachments"/>
+ <div class="o_we_existing_attachments"/>
<div class="mt-4 text-center mx-auto">
<button class="btn btn-primary o_load_more" type="button">Load more...</button>
<div class="mt-4 o_load_done_msg d-none">
@@ -243,8 +243,8 @@
</t>
<t t-name="wysiwyg.widgets.image.existing.attachments">
- <div class="o_we_images">
- <ol class="existing-attachments d-flex flex-wrap mx-auto my-0 p-2">
+ <div class="o_we_existing_attachments o_we_images">
+ <ol class="d-flex flex-wrap mx-auto my-0 p-2">
<t t-foreach="attachments" t-as="attachment">
<t t-call="wysiwyg.widgets.image.existing.attachment"/>
</t>
@@ -263,8 +263,8 @@
</t>
<t t-name="wysiwyg.widgets.document.existing.attachments">
- <div class="o_we_documents">
- <div class="row mx-auto existing-attachments">
+ <div class="o_we_existing_attachments o_we_documents">
+ <div class="row mx-auto">
<t t-foreach="attachments" t-as="attachment">
<div class="col-2 o_existing_attachment_cell o_we_attachment_highlight my-2" t-att-data-id="attachment.id">
<t t-call="wysiwyg.widgets.file.existing.remove"/>
diff --git a/addons/web_editor/static/tests/wysiwyg_snippets_tests.js b/addons/web_editor/static/tests/wysiwyg_snippets_tests.js
index 842aeea1f2f..f708b76b016 100644
--- a/addons/web_editor/static/tests/wysiwyg_snippets_tests.js
+++ b/addons/web_editor/static/tests/wysiwyg_snippets_tests.js
@@ -358,7 +358,7 @@ QUnit.test('background-image', function (assert) {
$('#oe_manipulators .oe_overlay_options a.snippet-option-background[data-choose-image]').click();
defMediaDialogInit.then(function () {
- $('.o_select_media_dialog .existing-attachments .o_existing_attachment_cell').click();
+ $('.o_select_media_dialog .o_we_existing_attachments .o_existing_attachment_cell').click();
$('.o_select_media_dialog .modal-footer .btn-primary').click();
});
diff --git a/addons/web_unsplash/static/src/js/unsplash_image_widget.js b/addons/web_unsplash/static/src/js/unsplash_image_widget.js
index 8244f12b4b9..8fb78e7ccb6 100644
--- a/addons/web_unsplash/static/src/js/unsplash_image_widget.js
+++ b/addons/web_unsplash/static/src/js/unsplash_image_widget.js
@@ -177,7 +177,7 @@ widgetsMedia.ImageWidget.include({
*/
_toggleUnsplashContainer: function (show) {
this._unsplash.isActive = show;
- this.$('.existing-attachments').toggleClass('d-none', show);
+ this.$('.o_we_existing_attachments').toggleClass('d-none', show);
this.$('.unsplash_img_container').toggleClass('d-none', !show);
this.$('.o_we_search_icon > span').text(show ? "Unsplash" : "");
},
diff --git a/addons/web_unsplash/static/src/xml/unsplash_image_widget.xml b/addons/web_unsplash/static/src/xml/unsplash_image_widget.xml
index 73593b25e50..5610e977b9b 100644
--- a/addons/web_unsplash/static/src/xml/unsplash_image_widget.xml
+++ b/addons/web_unsplash/static/src/xml/unsplash_image_widget.xml
@@ -2,7 +2,7 @@
<templates id="template" xml:space="preserve">
<t t-extend="wysiwyg.widgets.file">
- <t t-jquery=".existing-attachments" t-operation="after">
+ <t t-jquery=".o_we_existing_attachments" t-operation="after">
<div class="unsplash_img_container"></div>
</t>
</t>