Skip to content

Commit 8fe2a45

Browse files
committed
MC-5474: Anchor tag name is used on banner/slide/image wrapper when no link is specified by admin
Move button-item a/div conditional switch to master template
1 parent 09e8745 commit 8fe2a45

File tree

3 files changed

+10
-19
lines changed

3 files changed

+10
-19
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/button-item/default/master.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
-->
77

88
<div attr="data.main.attributes" ko-style="data.main.style" css="data.main.css">
9-
<a attr="data.link.attributes" ko-style="data.link.style" css="data.link.css">
9+
<a if="data.link.attributes().href" attr="data.link.attributes" ko-style="data.link.style" css="data.link.css">
1010
<span attr="data.link_text.attributes" html="data.link_text.html"></span>
1111
</a>
12+
<div ifnot="data.link.attributes().href" attr="data.link.attributes" ko-style="data.link.style" css="data.link.css">
13+
<span attr="data.link_text.attributes" html="data.link_text.html"></span>
14+
</div>
1215
</div>

app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/button-item/default/preview.html

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
css="Object.assign({focused: $parent.parent.preview.focusedButton() === $index()}, data.main.css())"
1111
class="pagebuilder-content-type pagebuilder-button-item no-system-border focus-options">
1212
<render args="getOptions().template" />
13-
<a if="data.link.attributes().href"
14-
attr="data.link.attributes"
13+
<a attr="data.link.attributes"
1514
ko-style="data.link.style"
1615
css="data.link.css"
1716
click="function (context, event) { onClick($index(), event); }"
@@ -22,16 +21,4 @@
2221
event="{ focusin: function (context, event) { onFocusIn($index(), event); }, focusout: function (context, event) { onFocusOut($index(), event); } }">
2322
</span>
2423
</a>
25-
<div ifnot="data.link.attributes().href"
26-
attr="data.link.attributes"
27-
ko-style="data.link.style"
28-
css="data.link.css"
29-
click="function (context, event) { onClick($index(), event); }"
30-
event="{ dragstart: function(context, event) { event.preventDefault(); }}">
31-
<span class="button-item-drag-handle" css="{disabled: parent.parent.children().length <= 1}"></span>
32-
<span attr="data.link_text.attributes"
33-
data-bind="liveEdit: { field: 'button_text', placeholder: buttonPlaceholder, selectAll: true }, hasFocusNoScroll: $parent.parent.preview.focusedButton() === $index()"
34-
event="{ focusin: function (context, event) { onFocusIn($index(), event); }, focusout: function (context, event) { onFocusOut($index(), event); } }">
35-
</span>
36-
</div>
3724
</div>

app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/button-item/_default.less

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@
1313
max-width: 100%;
1414
word-wrap: break-word;
1515
}
16+
div[data-element='link'] {
17+
cursor: default;
18+
}
1619
}
1720

1821
a,
19-
button {
20-
22+
button,
23+
div {
2124
&.pagebuilder-button-link {
2225
.lib-button-l();
2326
.lib-button-as-link(
@@ -45,6 +48,4 @@ button {
4548
.lib-css(border-radius, @button__border-radius);
4649
box-shadow: none;
4750
}
48-
49-
5051
}

0 commit comments

Comments
 (0)