Skip to content

Commit faa5f9a

Browse files
author
Zaets Volodymyr
committed
MAGETWO-42996: Implement prompt, alert, confirm dialogs
1 parent 2076868 commit faa5f9a

File tree

25 files changed

+651
-459
lines changed

25 files changed

+651
-459
lines changed

app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010

1111
<?php if (is_array($block->getChildBlock('diagrams')->getTabsIds())) : ?>
1212
<script>
13-
require(['prototype'], function(){
13+
require([
14+
'Magento_Ui/js/modal/alert',
15+
'prototype'
16+
], function(alert){
1417

1518
window.changeDiagramsPeriod = function(periodObj) {
1619
periodParam = periodObj.value ? 'period/' + periodObj.value + '/' : '';
@@ -25,7 +28,9 @@ window.changeDiagramsPeriod = function(periodObj) {
2528
if (transport.responseText.isJSON()) {
2629
var response = transport.responseText.evalJSON()
2730
if (response.error) {
28-
alert(response.message);
31+
alert({
32+
content: response.message
33+
});
2934
}
3035
if(response.ajaxExpired && response.ajaxRedirect) {
3136
setLocation(response.ajaxRedirect);
@@ -47,9 +52,11 @@ window.changeDiagramsPeriod = function(periodObj) {
4752
tabContentElementId = 'dashboard_diagram_totals';
4853
try {
4954
if (transport.responseText.isJSON()) {
50-
var response = transport.responseText.evalJSON()
55+
var response = transport.responseText.evalJSON();
5156
if (response.error) {
52-
alert(response.message);
57+
alert({
58+
content: response.message
59+
});
5360
}
5461
if(response.ajaxExpired && response.ajaxRedirect) {
5562
setLocation(response.ajaxRedirect);

app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@
3131
require([
3232
"jquery",
3333
'mage/template',
34+
'Magento_Ui/js/modal/alert',
3435
"mage/translate",
3536
"jquery/file-uploader"
36-
], function ($, mageTemplate) {
37+
], function ($, mageTemplate, alert) {
3738

3839
$('#fileupload').fileupload({
3940
dataType: 'json',
@@ -75,7 +76,9 @@ require([
7576
$('#' + data.fileId)
7677
.delay(2000)
7778
.hide('highlight');
78-
alert($.mage.__('We don\'t recognize or support this file extension type.'));
79+
alert({
80+
content: $.mage.__('We don\'t recognize or support this file extension type.')
81+
});
7982
}
8083
$('#' + data.fileId).remove();
8184
},

app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ require([
2121
"jquery",
2222
"tinymce",
2323
'Magento_Ui/js/modal/confirm',
24+
'Magento_Ui/js/modal/alert',
2425
"loadingPopup",
2526
"mage/backend/floating-header"
26-
], function(jQuery, tinyMCE, confirm){
27+
], function(jQuery, tinyMCE, confirm, alert){
2728

2829
//<![CDATA[
2930
function categoryReset(url,useAjax){
@@ -87,7 +88,9 @@ require([
8788
});
8889
$categoryContainer.html('');
8990
} catch (e) {
90-
alert(e.message);
91+
alert({
92+
content: e.message
93+
});
9194
}
9295
$categoryContainer.html(data.content).trigger('contentUpdated');
9396
setTimeout(function() {
@@ -104,7 +107,9 @@ require([
104107
window.refreshTreeArea();
105108
}
106109
} catch (e) {
107-
alert(e.message);
110+
alert({
111+
content: e.message
112+
});
108113
};
109114
}, 25);
110115
}

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88

99
?>
1010
<script>
11-
require(["jquery", "collapsable", "prototype"], function(jQuery){
11+
require([
12+
"jquery",
13+
'Magento_Ui/js/modal/alert',
14+
"collapsable",
15+
"prototype"
16+
], function(jQuery, alert){
1217

1318
function toggleApplyVisibility(select) {
1419
if ($(select).value == 1) {
@@ -269,7 +274,10 @@ function saveAttributeInNewSet(promptMessage)
269274
var rules = ['required-entry', 'validate-no-html-tags'];
270275
for (var i = 0; i < rules.length; i++) {
271276
if (!jQuery.validator.methods[rules[i]](newAttributeSetName)) {
272-
alert(jQuery.validator.messages[rules[i]]);
277+
alert({
278+
content: jQuery.validator.messages[rules[i]]
279+
});
280+
273281
return;
274282
}
275283
}

0 commit comments

Comments
 (0)