diff --git a/dashboard-ui/scripts/pluginspage.js b/dashboard-ui/scripts/pluginspage.js index 1aa331dba9..aea3c158cf 100644 --- a/dashboard-ui/scripts/pluginspage.js +++ b/dashboard-ui/scripts/pluginspage.js @@ -4,16 +4,15 @@ var msg = Globalize.translate('UninstallPluginConfirmation').replace("{0}", name); - Dashboard.confirm(msg, Globalize.translate('UninstallPluginHeader'), function (result) { - - if (result) { + require(['confirm'], function (confirm) { + confirm(msg, Globalize.translate('UninstallPluginHeader')).then(function () { Dashboard.showLoadingMsg(); ApiClient.uninstallPlugin(uniqueid).then(function () { reloadList(page); }); - } + }); }); } diff --git a/dashboard-ui/scripts/scheduledtaskpage.js b/dashboard-ui/scripts/scheduledtaskpage.js index bb30206ce9..bcde0779cb 100644 --- a/dashboard-ui/scripts/scheduledtaskpage.js +++ b/dashboard-ui/scripts/scheduledtaskpage.js @@ -169,14 +169,11 @@ var ScheduledTaskPage = { confirmDeleteTrigger: function (index) { - Dashboard.confirm(Globalize.translate('MessageDeleteTaskTrigger'), Globalize.translate('HeaderDeleteTaskTrigger'), function (result) { - - if (result) { + require(['confirm'], function (confirm) { + confirm(Globalize.translate('MessageDeleteTaskTrigger'), Globalize.translate('HeaderDeleteTaskTrigger')).then(function () { ScheduledTaskPage.deleteTrigger(index); - } - + }); }); - }, deleteTrigger: function (index) { diff --git a/dashboard-ui/scripts/serversecurity.js b/dashboard-ui/scripts/serversecurity.js index 93d3b7ed68..28039264c2 100644 --- a/dashboard-ui/scripts/serversecurity.js +++ b/dashboard-ui/scripts/serversecurity.js @@ -2,10 +2,9 @@ function revoke(page, key) { - Dashboard.confirm(Globalize.translate('MessageConfirmRevokeApiKey'), Globalize.translate('HeaderConfirmRevokeApiKey'), function (result) { - - if (result) { + require(['confirm'], function (confirm) { + confirm(Globalize.translate('MessageConfirmRevokeApiKey'), Globalize.translate('HeaderConfirmRevokeApiKey')).then(function () { Dashboard.showLoadingMsg(); ApiClient.ajax({ @@ -16,7 +15,7 @@ loadData(page); }); - } + }); }); } diff --git a/dashboard-ui/scripts/taskbutton.js b/dashboard-ui/scripts/taskbutton.js index 98e1846bf1..04a2a47eb1 100644 --- a/dashboard-ui/scripts/taskbutton.js +++ b/dashboard-ui/scripts/taskbutton.js @@ -95,15 +95,14 @@ msg += '' + Globalize.translate('ButtonScheduledTasks') + ''; msg += ''; - Dashboard.confirm(msg, Globalize.translate('HeaderConfirmation'), function (result) { - - if (result) { + require(['confirm'], function (confirm) { + confirm(msg, Globalize.translate('HeaderConfirmation')).then(function () { appStorage.setItem(key, expectedValue); onScheduledTaskMessageConfirmed(button, id); - } - }); + }); + }); } }