Skip to content

Commit 79fa833

Browse files
blse-odoorobinlej
authored andcommitted
split so_content_addition_selector by plugin
1 parent d9423ef commit 79fa833

17 files changed

+18
-27
lines changed

addons/html_builder/static/src/core/dropzone_selector_plugin.js

+2-27
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ export class DropZoneSelectorPlugin extends Plugin {
3333
].join(", ");
3434
},
3535
exclude: `${special_cards_selector}`,
36+
dropIn: "nav",
3637
get dropNear() {
3738
return `p, h1, h2, h3, ul, ol, div:not(.o_grid_item_image) > img, div:not(.o_grid_item_image) > a, .btn, ${this.plugin
3839
.getResource("so_content_addition_selector")
3940
.join(", ")}, .s_card:not(${special_cards_selector})`;
4041
},
41-
dropIn: "nav",
4242
excludeNearParent: so_snippet_addition_drop_in,
4343
},
4444
{
@@ -61,34 +61,9 @@ export class DropZoneSelectorPlugin extends Plugin {
6161
so_snippet_addition_selector: ["section", ".parallax", ".s_hr"],
6262
so_content_addition_selector: [
6363
"blockquote",
64-
".s_alert",
65-
".o_facebook_page",
66-
".s_share",
67-
".s_social_media",
68-
".s_rating",
69-
".s_hr",
70-
".s_google_map",
71-
".s_map",
72-
".s_countdown",
73-
".s_chart",
7464
".s_text_highlight",
75-
".s_progress_bar",
76-
".s_badge",
77-
".s_embed_code",
78-
".s_donation",
79-
".s_add_to_cart",
80-
".s_online_appointment",
65+
".s_donation", // TODO: move to plugin
8166
".o_snippet_drop_in_only",
82-
".s_image",
83-
".s_cta_badge",
84-
".s_accordion",
8567
],
8668
};
8769
}
88-
89-
/** TODO add xpath
90-
* <xpath expr:"//div[@id='so_content_addition']" position="attributes">
91-
<attribute name="selector" add=".s_progress_bar" separator:","/>
92-
<attribute name="dropNear" add=".s_progress_bar" separator:","/>
93-
</xpath>
94-
*/

addons/html_builder/static/src/plugins/alert_option_plugin.js

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class AlertOptionPlugin extends Plugin {
4040
selector: ".s_alert",
4141
}),
4242
],
43+
so_content_addition_selector: [".s_alert"],
4344
};
4445
}
4546
registry.category("website-plugins").add(AlertOptionPlugin.id, AlertOptionPlugin);

addons/html_builder/static/src/plugins/countdown_option_plugin.js

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ class CountdownOptionPlugin extends Plugin {
1313
cleanForSave: this.cleanForSave.bind(this),
1414
}),
1515
],
16+
so_content_addition_selector: [".s_countdown"],
1617
builder_actions: {
1718
// TODO AGAU: update after merging generalized restart interactions
1819
// remove this and xml BuilderContext

addons/html_builder/static/src/plugins/rating_option_plugin.js

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ class RatingOptionPlugin extends Plugin {
1010
template: "html_builder.RatingOption",
1111
selector: ".s_rating",
1212
},
13+
so_content_addition_selector: [".s_rating"],
1314
builder_actions: this.getActions(),
1415
};
1516
getActions() {

addons/html_builder/static/src/plugins/separator_option_plugin.js

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class SeparatorOptionPlugin extends Plugin {
1515
selector: ".s_hr",
1616
dropNear: "p, h1, h2, h3, blockquote, .s_hr",
1717
},
18+
so_content_addition_selector: [".s_hr"],
1819
};
1920
}
2021
registry.category("website-plugins").add(SeparatorOptionPlugin.id, SeparatorOptionPlugin);

addons/html_builder/static/src/website_builder/plugins/options/accordion_option_plugin.js

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class accordionOptionPlugin extends Plugin {
1717
selector: ".s_accordion .accordion-item",
1818
}),
1919
],
20+
so_content_addition_selector: [".s_accordion"],
2021
builder_actions: this.getActions(),
2122
};
2223

addons/html_builder/static/src/website_builder/plugins/options/badge_option_plugin.js

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ class BadgeOptionPlugin extends Plugin {
1111
selector: ".s_badge",
1212
}),
1313
],
14+
so_content_addition_selector: [".s_badge"],
1415
};
1516
}
1617
registry.category("website-plugins").add(BadgeOptionPlugin.id, BadgeOptionPlugin);

addons/html_builder/static/src/website_builder/plugins/options/chart_option_plugin.js

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class ChartOptionPlugin extends Plugin {
1818
},
1919
},
2020
],
21+
so_content_addition_selector: [".s_chart"],
2122
builder_actions: this.getActions(),
2223
};
2324

addons/html_builder/static/src/website_builder/plugins/options/cta_badge_option_plugin.js

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ class CTABadgeOptionPlugin extends Plugin {
1010
selector: ".s_cta_badge",
1111
},
1212
],
13+
so_content_addition_selector: [".s_cta_badge"],
1314
};
1415
}
1516
registry.category("website-plugins").add(CTABadgeOptionPlugin.id, CTABadgeOptionPlugin);

addons/html_builder/static/src/website_builder/plugins/options/embed_code_option_plugin.js

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class EmbedCodeOptionPlugin extends Plugin {
1515
selector: ".s_embed_code",
1616
}),
1717
],
18+
so_content_addition_selector: [".s_embed_code"],
1819
builder_actions: this.getActions(),
1920
clean_for_save_handlers: this.cleanForSave.bind(this),
2021
};

addons/html_builder/static/src/website_builder/plugins/options/facebook_option_plugin.js

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ class FacebookOptionPlugin extends Plugin {
1414
selector: ".o_facebook_page",
1515
},
1616
],
17+
so_content_addition_selector: [".o_facebook_page"],
1718
builder_actions: {
1819
dataAttributeListAction: {
1920
isApplied: ({ editingElement, param: { mainParam } = {}, value }) =>

addons/html_builder/static/src/website_builder/plugins/options/google_maps_option/google_maps_option_plugin.js

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export class GoogleMapsOptionPlugin extends Plugin {
4646
},
4747
},
4848
],
49+
so_content_addition_selector: [".s_google_map"],
4950
builder_actions: this.getActions(),
5051
};
5152

addons/html_builder/static/src/website_builder/plugins/options/image_snippet_option_plugin.js

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ class ImageSnippetOptionPlugin extends Plugin {
66
static dependencies = ["media"];
77
resources = {
88
on_snippet_dropped_handlers: this.onSnippetDropped.bind(this),
9+
so_content_addition_selector: [".s_image"],
910
};
1011

1112
async onSnippetDropped({ snippetEl }) {

addons/html_builder/static/src/website_builder/plugins/options/map_option_plugin.js

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class MapOptionPlugin extends Plugin {
1212
selector: ".s_map",
1313
},
1414
],
15+
so_content_addition_selector: [".s_map"],
1516
builder_actions: this.getActions(),
1617
};
1718

addons/html_builder/static/src/website_builder/plugins/options/progress_bar_option_plugin.js

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class ProgressBarOptionPlugin extends Plugin {
1212
cleanForSave: this.cleanForSave.bind(this),
1313
},
1414
builder_actions: this.getActions(),
15+
so_content_addition_selector: [".s_progress_bar"],
1516
};
1617

1718
cleanForSave(editingEl) {

addons/html_builder/static/src/website_builder/plugins/options/social_media_option_plugin.js

+1
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ class SocialMediaOptionPlugin extends Plugin {
124124
selector: ".s_social_media",
125125
}),
126126
],
127+
so_content_addition_selector: [".s_share", ".s_social_media"],
127128
builder_actions: {
128129
deleteSocialMediaLink: {
129130
apply: ({ editingElement }) => {

addons/html_builder/static/src/website_sale/add_to_cart_option_plugin.js

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class AddToCartOptionPlugin extends Plugin {
1212
selector: ".s_add_to_cart",
1313
},
1414
],
15+
so_content_addition_selector: [".s_add_to_cart"],
1516
builder_actions: {
1617
productToCartAction: {
1718
apply: ({ editingElement, value }) => {

0 commit comments

Comments
 (0)