summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Kersten <jke@odoo.com>2020-09-02 16:12:38 +0000
committerJeremy Kersten <jke@odoo.com>2020-09-10 21:12:08 +0000
commit7b0a147cd43e8e890ebe5a882292a69a5c8c90ac (patch)
treee4d30e0f447b1d5312533ac95e6cf07945fe174c
parent24bd2e805e730b6b8d62c4698686588183d4cdaf (diff)
[IMP] website: add data-option-name att to define class
OptionId was previously based on data-js name. But if an option has no js the classname was snippet-option-undefined, now we fallback on data-option-name to have a right name, and be easily selectable by theme tour.
-rw-r--r--addons/web_editor/static/src/js/editor/snippets.editor.js2
-rw-r--r--addons/web_editor/views/snippets.xml3
-rw-r--r--addons/website/views/snippets/snippets.xml6
3 files changed, 6 insertions, 5 deletions
diff --git a/addons/web_editor/static/src/js/editor/snippets.editor.js b/addons/web_editor/static/src/js/editor/snippets.editor.js
index 45139bb00fe..6941c7a8fdb 100644
--- a/addons/web_editor/static/src/js/editor/snippets.editor.js
+++ b/addons/web_editor/static/src/js/editor/snippets.editor.js
@@ -1552,7 +1552,7 @@ var SnippetsMenu = Widget.extend({
var exclude = $style.data('exclude') || '';
var target = $style.data('target');
var noCheck = $style.data('no-check');
- var optionID = $style.data('js');
+ var optionID = $style.data('js') || $style.data('option-name'); // used in tour js as selector
var option = {
'option': optionID,
'base_selector': selector,
diff --git a/addons/web_editor/views/snippets.xml b/addons/web_editor/views/snippets.xml
index 5edda5c1dfd..e623cc5300a 100644
--- a/addons/web_editor/views/snippets.xml
+++ b/addons/web_editor/views/snippets.xml
@@ -208,7 +208,8 @@
</div>
<!-- Color filter -->
- <div t-att-data-selector="selector"
+ <div data-option-name="colorFilter"
+ t-att-data-selector="selector"
t-att-data-exclude="exclude"
t-att-data-target="target">
<we-colorpicker string="⌙ Color filter"
diff --git a/addons/website/views/snippets/snippets.xml b/addons/website/views/snippets/snippets.xml
index 46cb3dfbf61..ac44ad6ec71 100644
--- a/addons/website/views/snippets/snippets.xml
+++ b/addons/website/views/snippets/snippets.xml
@@ -480,7 +480,7 @@
</div>
<!-- Mobile display options -->
- <div data-selector="section .row > div"
+ <div data-option-name="showMobile" data-selector="section .row > div"
data-exclude=".s_col_no_resize.row > div">
<we-checkbox string="Shown On Mobile" data-select-class="d-none d-md-block|" data-no-preview="true"/>
</div>
@@ -1002,7 +1002,7 @@
</div>
<!-- Min height of section -->
- <div data-selector="section">
+ <div data-option-name="minHeight" data-selector="section">
<we-button-group string="Height">
<we-button data-select-class="" title="Fit content">Auto</we-button>
<we-button data-select-class="o_half_screen_height" title="Half screen">50%</we-button>
@@ -1031,7 +1031,7 @@
</div>
<!-- Vertical Alignment -->
- <div id="row_valign_snippet_option" data-selector=".s_text_image, .s_image_text, .s_three_columns" data-target=".row">
+ <div data-option-name="vAlignment" id="row_valign_snippet_option" data-selector=".s_text_image, .s_image_text, .s_three_columns" data-target=".row">
<we-button-group string="Vert. Alignment" title="Vertical Alignment">
<we-button title="Align Top"
data-select-class="align-items-start"