Skip to content

Commit 0afa526

Browse files
danmooney2danmooney2
committed
MC-3934: Slide/Banner Overlay & Button Do Not Show On Storefront When Set To On Hover
Change widget name to click-event-binder
1 parent 24ab5d6 commit 0afa526

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

‎app/code/Magento/PageBuilder/etc/di.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -511,8 +511,8 @@
511511
<item name="dataRole" xsi:type="string">slide</item>
512512
</item>
513513
</item>
514-
<item name="bindClickToDataLinkElement" xsi:type="array">
515-
<item name="component" xsi:type="string">Magento_PageBuilder/js/widget/bind-click-to-data-link-element</item>
514+
<item name="clickEventBinder" xsi:type="array">
515+
<item name="component" xsi:type="string">Magento_PageBuilder/js/widget/click-event-binder</item>
516516
</item>
517517
</item>
518518
<item name="banner" xsi:type="array">
@@ -524,8 +524,8 @@
524524
<item name="dataRole" xsi:type="string">banner</item>
525525
</item>
526526
</item>
527-
<item name="bindClickToDataLinkElement" xsi:type="array">
528-
<item name="component" xsi:type="string">Magento_PageBuilder/js/widget/bind-click-to-data-link-element</item>
527+
<item name="clickEventBinder" xsi:type="array">
528+
<item name="component" xsi:type="string">Magento_PageBuilder/js/widget/click-event-binder</item>
529529
</item>
530530
</item>
531531
<item name="buttons" xsi:type="array">

‎app/code/Magento/PageBuilder/view/base/web/js/widget/bind-click-to-data-link-element.js renamed to ‎app/code/Magento/PageBuilder/view/base/web/js/widget/click-event-binder.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ define(['jquery'], function ($) {
1111
* @param {Object|null} config
1212
* @param {Node} element
1313
*/
14-
function bindClickWidget(config, element) {
14+
function clickEventBinder(config, element) {
1515
var $linkElements = $(element).find('[data-link-type]');
1616

1717
$linkElements.each(function (idx, linkElement) {
@@ -31,7 +31,7 @@ define(['jquery'], function ($) {
3131
return;
3232
}
3333

34-
bindClickWidget.redirectTo(
34+
clickEventBinder.redirectTo(
3535
$linkElement.attr('href'),
3636
$linkElement.attr('target')
3737
);
@@ -44,13 +44,13 @@ define(['jquery'], function ($) {
4444
* @param {String} href
4545
* @param {String} target
4646
*/
47-
bindClickWidget.redirectTo = function (href, target) {
47+
clickEventBinder.redirectTo = function (href, target) {
4848
if (target === '_blank') {
4949
window.open(href, target);
5050
} else {
5151
window.location.href = href;
5252
}
5353
};
5454

55-
return bindClickWidget;
55+
return clickEventBinder;
5656
});

‎dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/widget/bind-click-to-data-link-element.test.js renamed to ‎dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/widget/click-event-binder.js

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
* See COPYING.txt for license details.
44
*/
55
define([
6-
'Magento_PageBuilder/js/widget/bind-click-to-data-link-element',
6+
'Magento_PageBuilder/js/widget/click-event-binder',
77
'jquery'
8-
], function (bindClickToLinkInitializerWidget, $) {
8+
], function (clickEventBinderInitializerWidget, $) {
99
'use strict';
1010

1111
var $el,
12-
originalRedirectTo = bindClickToLinkInitializerWidget.redirectTo;
12+
originalRedirectTo = clickEventBinderInitializerWidget.redirectTo;
1313

1414
afterEach(function () {
1515
if ($el !== undefined) {
1616
$el.remove();
1717
}
1818
});
1919

20-
describe('Magento_PageBuilder/js/widget/bind-click-to-data-link-element', function () {
20+
describe('Magento_PageBuilder/js/widget/click-event-binder', function () {
2121
it('Should not navigate away from page if it is missing href attribute', function () {
22-
spyOn(bindClickToLinkInitializerWidget, 'redirectTo');
22+
spyOn(clickEventBinderInitializerWidget, 'redirectTo');
2323
spyOn(window, 'open');
2424

2525
$el = $(
@@ -33,16 +33,16 @@ define([
3333

3434
$el.appendTo('body');
3535

36-
bindClickToLinkInitializerWidget(null, $el);
36+
clickEventBinderInitializerWidget(null, $el);
3737

3838
$el.find('.span-outside-inner-anchor').click();
3939

40-
expect(bindClickToLinkInitializerWidget.redirectTo).not.toHaveBeenCalled();
40+
expect(clickEventBinderInitializerWidget.redirectTo).not.toHaveBeenCalled();
4141
expect(window.open).not.toHaveBeenCalled();
4242
});
4343

4444
it('Should not navigate away from page if href is javascript:void(0)', function () {
45-
spyOn(bindClickToLinkInitializerWidget, 'redirectTo');
45+
spyOn(clickEventBinderInitializerWidget, 'redirectTo');
4646
spyOn(window, 'open');
4747

4848
$el = $(
@@ -56,16 +56,16 @@ define([
5656

5757
$el.appendTo('body');
5858

59-
bindClickToLinkInitializerWidget(null, $el);
59+
clickEventBinderInitializerWidget(null, $el);
6060

6161
$el.find('.span-outside-inner-anchor').click();
6262

63-
expect(bindClickToLinkInitializerWidget.redirectTo).not.toHaveBeenCalled();
63+
expect(clickEventBinderInitializerWidget.redirectTo).not.toHaveBeenCalled();
6464
expect(window.open).not.toHaveBeenCalled();
6565
});
6666

6767
it('Should not navigate away from page if it is missing data-link-type attribute', function () {
68-
spyOn(bindClickToLinkInitializerWidget, 'redirectTo');
68+
spyOn(clickEventBinderInitializerWidget, 'redirectTo');
6969
spyOn(window, 'open');
7070

7171
$el = $(
@@ -79,16 +79,16 @@ define([
7979

8080
$el.appendTo('body');
8181

82-
bindClickToLinkInitializerWidget(null, $el);
82+
clickEventBinderInitializerWidget(null, $el);
8383

8484
$el.find('.span-outside-inner-anchor').click();
8585

86-
expect(bindClickToLinkInitializerWidget.redirectTo).not.toHaveBeenCalled();
86+
expect(clickEventBinderInitializerWidget.redirectTo).not.toHaveBeenCalled();
8787
expect(window.open).not.toHaveBeenCalled();
8888
});
8989

9090
it('Should not navigate to simulated anchor\'s href if clicked inside of nested anchor', function () {
91-
spyOn(bindClickToLinkInitializerWidget, 'redirectTo');
91+
spyOn(clickEventBinderInitializerWidget, 'redirectTo');
9292
spyOn(window, 'open');
9393

9494
$el = $(
@@ -102,16 +102,16 @@ define([
102102

103103
$el.appendTo('body');
104104

105-
bindClickToLinkInitializerWidget(null, $el);
105+
clickEventBinderInitializerWidget(null, $el);
106106

107107
$el.find('.inner-anchor').click();
108108

109-
expect(bindClickToLinkInitializerWidget.redirectTo).not.toHaveBeenCalled();
109+
expect(clickEventBinderInitializerWidget.redirectTo).not.toHaveBeenCalled();
110110
expect(window.open).not.toHaveBeenCalled();
111111
});
112112

113113
it('Should navigate to simulated anchor\'s href if clicked outside of nested anchor', function () {
114-
spyOn(bindClickToLinkInitializerWidget, 'redirectTo');
114+
spyOn(clickEventBinderInitializerWidget, 'redirectTo');
115115
spyOn(window, 'open');
116116

117117
$el = $(
@@ -125,19 +125,19 @@ define([
125125

126126
$el.appendTo('body');
127127

128-
bindClickToLinkInitializerWidget(null, $el);
128+
clickEventBinderInitializerWidget(null, $el);
129129

130130
$el.find('.span-outside-inner-anchor').click();
131131

132-
expect(bindClickToLinkInitializerWidget.redirectTo).toHaveBeenCalledWith('https://adobe.com', '');
132+
expect(clickEventBinderInitializerWidget.redirectTo).toHaveBeenCalledWith('https://adobe.com', '');
133133

134134
originalRedirectTo('https://adobe.com', '');
135135
expect(window.open).not.toHaveBeenCalled();
136136
});
137137

138138
it('Should call window.open if target is _blank', function () {
139139
spyOn(window, 'open');
140-
spyOn(bindClickToLinkInitializerWidget, 'redirectTo');
140+
spyOn(clickEventBinderInitializerWidget, 'redirectTo');
141141

142142
$el = $(
143143
'<div data-role="content-type">' +
@@ -150,11 +150,11 @@ define([
150150

151151
$el.appendTo('body');
152152

153-
bindClickToLinkInitializerWidget(null, $el);
153+
clickEventBinderInitializerWidget(null, $el);
154154

155155
$el.find('.span-outside-inner-anchor').click();
156156

157-
expect(bindClickToLinkInitializerWidget.redirectTo).toHaveBeenCalledWith('https://adobe.com', '_blank');
157+
expect(clickEventBinderInitializerWidget.redirectTo).toHaveBeenCalledWith('https://adobe.com', '_blank');
158158

159159
originalRedirectTo('https://adobe.com', '_blank');
160160
expect(window.open).toHaveBeenCalledWith('https://adobe.com', '_blank');

0 commit comments

Comments
 (0)