Skip to content

Commit f70e68c

Browse files
author
Bogdan Plieshka
committed
MAGETWO-37594: Implementation and fixes after review
- Clean up dialogs template attributes - Changed translation functions - Added aside tag
1 parent 0aa6b00 commit f70e68c

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

app/code/Magento/Ui/view/base/web/js/dialog/dialog.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ define([
3737
overlayClass: 'overlay_magento',
3838
responsiveClass: 'dialog-slide',
3939
dialogLeftMargin: 45,
40+
closeText: $.mage.__('Close'),
4041
buttons: [{
4142
text: $.mage.__('Ok'),
4243
class: '',

app/code/Magento/Ui/view/base/web/templates/dialog/dialog-modal.html

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
-->
77

8-
<section
8+
<aside
99
class="dialog-<%= data.type %> <%= data.dialogClass %>
1010
<% if(data.responsive){ %><%= data.responsiveClass %><% } %>
1111
<% if(data.innerScroll){ %><%= data.innerScrollClass %><% } %>"
@@ -17,10 +17,9 @@
1717
data-role="title"><%= data.title %></h1>
1818
<button
1919
class="action-close"
20-
data-action="close-mypopup"
2120
data-role="closeBtn"
2221
type="button">
23-
<span>$t('Close')</span>
22+
<span><%= data.closeText %></span>
2423
</button>
2524
</header>
2625
<div
@@ -31,8 +30,8 @@
3130
<button
3231
class="<%= button.class %>"
3332
type="button"
34-
data-role="action"><%= button.text %></button>
33+
data-role="action"><span><%= button.text %></span></button>
3534
<% }); %>
3635
</footer>
3736
</div>
38-
</section>
37+
</aside>

app/code/Magento/Ui/view/base/web/templates/dialog/dialog-slide.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
*/
66
-->
77

8-
<section
8+
<aside
99
class="dialog-<%= data.type %> <%= data.dialogClass %>
10-
<% if(data.innerScroll){ %><%= data.innerScrollClass %><% } %>"
10+
<% if(data.innerScroll){ %><%= data.innerScrollClass %><% } %>"
1111
data-role="dialog"
1212
data-type="<%= data.type %>">
1313
<div class="dialog-inner-wrap">
@@ -16,10 +16,9 @@
1616
data-role="title"><%= data.title %></h1>
1717
<button
1818
class="action-close"
19-
data-action="close-mypopup"
2019
data-role="closeBtn"
2120
type="button">
22-
<span>$t('Close')</span>
21+
<span><%= data.closeText %></span>
2322
</button>
2423
<div class="page-main-actions">
2524
<div class="page-actions">
@@ -28,7 +27,7 @@
2827
<button
2928
class="<%= button.class %>"
3029
type="button"
31-
data-role="action"><%= button.text %>
30+
data-role="action"><span><%= button.text %></span>
3231
</button>
3332
<% }); %>
3433
</div>
@@ -37,4 +36,4 @@
3736
</header>
3837
<div class="dialog-content" data-role="content"></div>
3938
</div>
40-
</section>
39+
</aside>

0 commit comments

Comments
 (0)