Skip to content

Commit 70a63e9

Browse files
author
Oleg Zinoviev
committed
MAGETWO-39999: Hints behave not user-friendly on Storefront
- Updated to dropdowns widget.
1 parent 6292bce commit 70a63e9

File tree

5 files changed

+38
-30
lines changed

5 files changed

+38
-30
lines changed

app/code/Magento/Payment/view/frontend/web/template/payment/cc-form.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,14 @@
104104
enable: isActive($parents),
105105
value: creditCardVerificationNumber"/>
106106
<div class="field-tooltip toggle">
107-
<span class="field-tooltip-action action-cvv" data-bind="attr: {title: $t('What is this?')}">
107+
<span class="field-tooltip-action action-cvv"
108+
data-toggle="dropdown"
109+
data-bind="attr: {title: $t('What is this?')}, mageInit: {'dropdown':{'activeClass': '_active'}}">
108110
<span><!-- ko text: $t('What is this?')--><!-- /ko --></span>
109111
</span>
110-
<div class="field-tooltip-content" data-bind="html: getCvvImageHtml()"></div>
112+
<div class="field-tooltip-content"
113+
data-target="dropdown"
114+
data-bind="html: getCvvImageHtml()"></div>
111115
</div>
112116
</div>
113117
</div>

app/code/Magento/Shipping/view/frontend/web/template/checkout/shipping/shipping-policy.html

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,14 @@
55
*/
66
-->
77
<div class="shipping-policy-block field-tooltip"
8-
data-block="shipping-policy-block"
98
data-bind="visible: config.isEnabled">
10-
<span class="field-tooltip-action" data-trigger="shipping-tooltip-action">
9+
<span class="field-tooltip-action"
10+
data-toggle="dropdown"
11+
data-bind="mageInit: {'dropdown':{'activeClass': '_active'}}">
1112
<!-- ko text: $t('See our Shipping Policy') --><!-- /ko -->
1213
</span>
1314
<div class="field-tooltip-content"
14-
data-bind="mageInit: {
15-
'dropdownDialog':{
16-
'appendTo': '[data-block=shipping-policy-block]',
17-
'triggerTarget': '[data-trigger=shipping-tooltip-action]',
18-
'closeOnMouseLeave': false,
19-
'triggerClass': '_active',
20-
'buttons': []
21-
}}">
15+
data-target="dropdown">
2216
<span data-bind="html: config.shippingPolicyContent"></span>
2317
</div>
2418
</div>

app/code/Magento/Ui/view/frontend/web/templates/form/element/helper/tooltip.html

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,13 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<div class="field-tooltip toggle" data-block="field-tooltip-block">
7+
<div class="field-tooltip toggle">
88
<a class="field-tooltip-action action-help"
99
target="_blank"
10-
data-trigger="field-tooltip-action"
11-
data-bind="attr: {href: tooltip.link}"></a>
10+
data-toggle="dropdown"
11+
data-bind="attr: {href: tooltip.link}, mageInit: {'dropdown':{'activeClass': '_active'}}"></a>
1212
<div class="field-tooltip-content"
13-
data-bind="mageInit: {
14-
'dropdownDialog':{
15-
'appendTo': '[data-block=field-tooltip-block]',
16-
'triggerTarget': '[data-trigger=field-tooltip-action]',
17-
'closeOnMouseLeave': false,
18-
'triggerClass': '_active',
19-
'buttons': []
20-
}}">
13+
data-target="dropdown">
2114
<!-- ko text: tooltip.description --><!-- /ko -->
2215
</div>
2316
</div>

app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,31 @@
4141
right: 0;
4242
top: 1px;
4343

44+
&:hover {
45+
cursor: pointer;
46+
}
47+
48+
&._active {
49+
.css(z-index, @checkout-tooltip__hover__z-index);
50+
51+
.field-tooltip-content {
52+
display: block;
53+
}
54+
.field-tooltip-action {
55+
&:before {
56+
.css(color, @checkout-tooltip-icon__hover__color);
57+
}
58+
}
59+
}
60+
4461
.field-tooltip-action {
4562
.icon-font(
46-
@checkout-tooltip-icon__content,
47-
@_icon-font-size: @checkout-tooltip-icon__font-size,
48-
@_icon-font-text-hide: true,
49-
@_icon-font-color: @checkout-tooltip-icon__color,
50-
@_icon-font-color-hover: @checkout-tooltip-icon__hover__color,
51-
@_icon-font-color-active: false
63+
@checkout-tooltip-icon__content,
64+
@_icon-font-size: @checkout-tooltip-icon__font-size,
65+
@_icon-font-text-hide: true,
66+
@_icon-font-color: @checkout-tooltip-icon__color,
67+
@_icon-font-color-hover: @checkout-tooltip-icon__hover__color,
68+
@_icon-font-color-active: false
5269
);
5370

5471
&._active {

lib/web/mage/dropdowns.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ define([
108108
if(options.autoclose === true) {
109109
self.reset({elems: actionElem.not(elem)});
110110
}
111-
self[elem.hasClass('active') ? 'closeDropdown' : 'openDropdown'](elem);
111+
self[elem.hasClass(options.activeClass) ? 'closeDropdown' : 'openDropdown'](elem);
112112

113113
return false;
114114
});

0 commit comments

Comments
 (0)