Merge remote-tracking branch 'origin/MAGETWO-55443' into MAGETWO-55814

Author: Sergey Shvets

app/code/Magento/Ui/view/base/web/js/modal/modal-component.js

@@ -18,6 +18,7 @@ define([
             title: '',
             subTitle: '',
             options: {
+                modalClass: '',
                 title: '',
                 subTitle: '',
                 buttons: [],

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

@@ -5,11 +5,11 @@
  */
 -->
 
-<aside class="modal-<%= data.type %> <%= data.modalClass %>
-       <% if(data.responsive){ %><%= data.responsiveClass %><% } %>
-       <% if(data.innerScroll){ %><%= data.innerScrollClass %><% } %>"
+<aside class="modal-<%- data.type %> <%- data.modalClass %>
+       <% if(data.responsive){ %><%- data.responsiveClass %><% } %>
+       <% if(data.innerScroll){ %><%- data.innerScrollClass %><% } %>"
     data-role="modal"
-    data-type="<%= data.type %>"
+    data-type="<%- data.type %>"
     tabindex="0">
     <div data-role="focusable-start" tabindex="0"></div>
     <div class="modal-inner-wrap"
@@ -31,7 +31,7 @@
         <footer class="modal-footer">
             <% _.each(data.buttons, function(button) { %>
             <button
-                    class="<%= button.class %>"
+                    class="<%- button.class %>"
                     type="button"
                     data-role="action"><span><%= button.text %></span></button>
             <% }); %>

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

@@ -6,11 +6,11 @@
 -->
 
 <aside
-    class="modal-<%= data.type %> <%= data.modalClass %>
-           <% if(data.responsive){ %><%= data.responsiveClass %><% } %>
-           <% if(data.innerScroll){ %><%= data.innerScrollClass %><% } %>"
+    class="modal-<%- data.type %> <%- data.modalClass %>
+           <% if(data.responsive){ %><%- data.responsiveClass %><% } %>
+           <% if(data.innerScroll){ %><%- data.innerScrollClass %><% } %>"
     data-role="modal"
-    data-type="<%= data.type %>"
+    data-type="<%- data.type %>"
     tabindex="0">
     <div data-role="focusable-start" tabindex="0"></div>
     <div class="modal-inner-wrap"
@@ -34,7 +34,7 @@
         <footer class="modal-footer">
             <% _.each(data.buttons, function(button) { %>
             <button
-                class="<%= button.class %>"
+                class="<%- button.class %>"
                 type="button"
                 data-role="action"><span><%= button.text %></span></button>
             <% }); %>

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

@@ -6,10 +6,10 @@
 -->
 
 <aside
-    class="modal-<%= data.type %> <%= data.modalClass %>
-           <% if(data.innerScroll){ %><%= data.innerScrollClass %><% } %>"
+    class="modal-<%- data.type %> <%- data.modalClass %>
+           <% if(data.innerScroll){ %><%- data.innerScrollClass %><% } %>"
     data-role="modal"
-    data-type="<%= data.type %>"
+    data-type="<%- data.type %>"
     tabindex="0">
     <div data-role="focusable-start" tabindex="0"></div>
     <div class="modal-inner-wrap"
@@ -38,7 +38,7 @@
                     <div class="page-actions-buttons">
                         <% _.each(data.buttons, function(button) { %>
                         <button
-                            class="<%= button.class %>"
+                            class="<%- button.class %>"
                             type="button"
                             data-role="action"><span><%= button.text %></span>
                         </button>