From 166a16b60d4409fb203dd21bb9dd9042ed9dd76f Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 22 Feb 2016 14:12:06 -0500 Subject: [PATCH] update to new confirm pattern --- .../components/imageeditor/imageeditor.js | 9 +++++---- .../medialibraryeditor/medialibraryeditor.js | 6 +++--- .../components/subtitleeditor/subtitleeditor.js | 7 +++---- dashboard-ui/scripts/autoorganizelog.js | 13 ++++++------- dashboard-ui/scripts/dashboardpage.js | 16 ++++++++-------- dashboard-ui/scripts/itemdetailpage.js | 13 ++++++------- dashboard-ui/scripts/librarypathmapping.js | 9 +++------ dashboard-ui/scripts/livetvseriestimer.js | 7 +++---- dashboard-ui/scripts/livetvseriestimers.js | 7 +++---- dashboard-ui/scripts/livetvtimer.js | 7 +++---- dashboard-ui/scripts/medialibrarypage.js | 7 +++---- 11 files changed, 46 insertions(+), 55 deletions(-) diff --git a/dashboard-ui/components/imageeditor/imageeditor.js b/dashboard-ui/components/imageeditor/imageeditor.js index d3945a4521..d708e0ba8d 100644 --- a/dashboard-ui/components/imageeditor/imageeditor.js +++ b/dashboard-ui/components/imageeditor/imageeditor.js @@ -119,17 +119,18 @@ var type = this.getAttribute('data-imagetype'); var index = this.getAttribute('data-index'); index = index == "null" ? null : parseInt(index); - Dashboard.confirm(Globalize.translate('DeleteImageConfirmation'), Globalize.translate('HeaderDeleteImage'), function (result) { - if (result) { + require(['confirm'], function (confirm) { + + confirm(Globalize.translate('DeleteImageConfirmation'), Globalize.translate('HeaderDeleteImage')).then(function () { + ApiClient.deleteItemImage(currentItem.Id, type, index).then(function () { hasChanges = true; reload(page); }); - } - + }); }); }); diff --git a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js index a6700126e0..e3d5c2210c 100644 --- a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js +++ b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js @@ -30,9 +30,9 @@ var location = virtualFolder.Locations[index]; - Dashboard.confirm(Globalize.translate('MessageConfirmRemoveMediaLocation'), Globalize.translate('HeaderRemoveMediaLocation'), function (confirmResult) { + require(['confirm'], function (confirm) { - if (confirmResult) { + confirm(Globalize.translate('MessageConfirmRemoveMediaLocation'), Globalize.translate('HeaderRemoveMediaLocation')).then(function () { var refreshAfterChange = currentOptions.refresh; @@ -45,7 +45,7 @@ Dashboard.alert(Globalize.translate('DefaultErrorMessage')); }); - } + }); }); } diff --git a/dashboard-ui/components/subtitleeditor/subtitleeditor.js b/dashboard-ui/components/subtitleeditor/subtitleeditor.js index 933e448ee9..af54ed738a 100644 --- a/dashboard-ui/components/subtitleeditor/subtitleeditor.js +++ b/dashboard-ui/components/subtitleeditor/subtitleeditor.js @@ -64,9 +64,9 @@ var msg = Globalize.translate('MessageAreYouSureDeleteSubtitles'); - Dashboard.confirm(msg, Globalize.translate('HeaderConfirmDeletion'), function (result) { + require(['confirm'], function (confirm) { - if (result) { + confirm(msg, Globalize.translate('HeaderConfirmDeletion')).then(function () { Dashboard.showLoadingMsg(); @@ -82,8 +82,7 @@ reload(page, itemId); }); - - } + }); }); } diff --git a/dashboard-ui/scripts/autoorganizelog.js b/dashboard-ui/scripts/autoorganizelog.js index fefd84fb13..4035345f7f 100644 --- a/dashboard-ui/scripts/autoorganizelog.js +++ b/dashboard-ui/scripts/autoorganizelog.js @@ -32,9 +32,9 @@ var message = Globalize.translate('MessageFileWillBeDeleted') + '

' + item.OriginalPath + '

' + Globalize.translate('MessageSureYouWishToProceed') + '

'; - Dashboard.confirm(message, Globalize.translate('HeaderDeleteFile'), function (confirmResult) { + require(['confirm'], function (confirm) { - if (confirmResult) { + confirm(message, Globalize.translate('HeaderDeleteFile')).then(function () { Dashboard.showLoadingMsg(); @@ -45,8 +45,7 @@ reloadItems(page); }, onApiFailure); - } - + }); }); } @@ -91,9 +90,9 @@ message += '

' + Globalize.translate('MessageSureYouWishToProceed') + '

'; - Dashboard.confirm(message, Globalize.translate('HeaderOrganizeFile'), function (confirmResult) { + require(['confirm'], function (confirm) { - if (confirmResult) { + confirm(message, Globalize.translate('HeaderOrganizeFile')).then(function () { Dashboard.showLoadingMsg(); @@ -104,7 +103,7 @@ reloadItems(page); }, onApiFailure); - } + }); }); } diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js index d13c2d2a5e..95fb4030b0 100644 --- a/dashboard-ui/scripts/dashboardpage.js +++ b/dashboard-ui/scripts/dashboardpage.js @@ -971,27 +971,27 @@ restart: function () { - Dashboard.confirm(Globalize.translate('MessageConfirmRestart'), Globalize.translate('HeaderRestart'), function (result) { + require(['confirm'], function (confirm) { + + confirm(Globalize.translate('MessageConfirmRestart'), Globalize.translate('HeaderRestart')).then(function () { - if (result) { $('#btnRestartServer').buttonEnabled(false); $('#btnShutdown').buttonEnabled(false); Dashboard.restartServer(); - } - + }); }); }, shutdown: function () { - Dashboard.confirm(Globalize.translate('MessageConfirmShutdown'), Globalize.translate('HeaderShutdown'), function (result) { + require(['confirm'], function (confirm) { + + confirm(Globalize.translate('MessageConfirmShutdown'), Globalize.translate('HeaderShutdown')).then(function () { - if (result) { $('#btnRestartServer').buttonEnabled(false); $('#btnShutdown').buttonEnabled(false); ApiClient.shutdownServer(); - } - + }); }); } }; diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 58761f1f06..f4c22bf28c 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -1886,9 +1886,9 @@ var id = getParameterByName('id'); - Dashboard.confirm("Are you sure you wish to split the media sources into separate items?", "Split Media Apart", function (confirmResult) { + require(['confirm'], function (confirm) { - if (confirmResult) { + confirm("Are you sure you wish to split the media sources into separate items?", "Split Media Apart").then(function () { Dashboard.showLoadingMsg(); @@ -1902,7 +1902,7 @@ reload(page); }); - } + }); }); } @@ -1951,9 +1951,9 @@ function deleteTimer(page, id) { - Dashboard.confirm(Globalize.translate('MessageConfirmRecordingCancellation'), Globalize.translate('HeaderConfirmRecordingCancellation'), function (result) { + require(['confirm'], function (confirm) { - if (result) { + confirm(Globalize.translate('MessageConfirmRecordingCancellation'), Globalize.translate('HeaderConfirmRecordingCancellation')).then(function () { Dashboard.showLoadingMsg(); @@ -1963,8 +1963,7 @@ reload(page); }); - } - + }); }); } diff --git a/dashboard-ui/scripts/librarypathmapping.js b/dashboard-ui/scripts/librarypathmapping.js index d4d128a9da..c0d022a4f3 100644 --- a/dashboard-ui/scripts/librarypathmapping.js +++ b/dashboard-ui/scripts/librarypathmapping.js @@ -4,9 +4,9 @@ function remove(page, index) { - Dashboard.confirm(Globalize.translate('MessageConfirmPathSubstitutionDeletion'), Globalize.translate('HeaderConfirmDeletion'), function (result) { + require(['confirm'], function (confirm) { - if (result) { + confirm(Globalize.translate('MessageConfirmPathSubstitutionDeletion'), Globalize.translate('HeaderConfirmDeletion')).then(function () { ApiClient.getServerConfiguration().then(function (config) { @@ -17,11 +17,8 @@ reload(page); }); }); - } - + }); }); - - } function addSubstitution(page, config) { diff --git a/dashboard-ui/scripts/livetvseriestimer.js b/dashboard-ui/scripts/livetvseriestimer.js index 9c23f41465..8d6d02cb85 100644 --- a/dashboard-ui/scripts/livetvseriestimer.js +++ b/dashboard-ui/scripts/livetvseriestimer.js @@ -4,9 +4,9 @@ function deleteTimer(page, id) { - Dashboard.confirm(Globalize.translate('MessageConfirmRecordingCancellation'), Globalize.translate('HeaderConfirmRecordingCancellation'), function (result) { + require(['confirm'], function (confirm) { - if (result) { + confirm(Globalize.translate('MessageConfirmRecordingCancellation'), Globalize.translate('HeaderConfirmRecordingCancellation')).then(function () { Dashboard.showLoadingMsg(); @@ -17,8 +17,7 @@ reload(page); }); - } - + }); }); } diff --git a/dashboard-ui/scripts/livetvseriestimers.js b/dashboard-ui/scripts/livetvseriestimers.js index 26ceb9579c..ca2bd283f7 100644 --- a/dashboard-ui/scripts/livetvseriestimers.js +++ b/dashboard-ui/scripts/livetvseriestimers.js @@ -8,9 +8,9 @@ function deleteSeriesTimer(page, id) { - Dashboard.confirm(Globalize.translate('MessageConfirmSeriesCancellation'), Globalize.translate('HeaderConfirmSeriesCancellation'), function (result) { + require(['confirm'], function (confirm) { - if (result) { + confirm(Globalize.translate('MessageConfirmSeriesCancellation'), Globalize.translate('HeaderConfirmSeriesCancellation')).then(function () { Dashboard.showLoadingMsg(); @@ -20,8 +20,7 @@ reload(page); }); - } - + }); }); } diff --git a/dashboard-ui/scripts/livetvtimer.js b/dashboard-ui/scripts/livetvtimer.js index 7dde49ad32..e3304df393 100644 --- a/dashboard-ui/scripts/livetvtimer.js +++ b/dashboard-ui/scripts/livetvtimer.js @@ -4,9 +4,9 @@ function deleteTimer(page, id) { - Dashboard.confirm(Globalize.translate('MessageConfirmRecordingCancellation'), Globalize.translate('HeaderConfirmRecordingCancellation'), function (result) { + require(['confirm'], function (confirm) { - if (result) { + confirm(Globalize.translate('MessageConfirmRecordingCancellation'), Globalize.translate('HeaderConfirmRecordingCancellation')).then(function () { Dashboard.showLoadingMsg(); @@ -16,8 +16,7 @@ Dashboard.navigate('livetv.html'); }); - } - + }); }); } diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js index 2c3f6bfc5c..0bc0b3f419 100644 --- a/dashboard-ui/scripts/medialibrarypage.js +++ b/dashboard-ui/scripts/medialibrarypage.js @@ -53,17 +53,16 @@ msg += virtualFolder.Locations.join("
"); } - Dashboard.confirm(msg, Globalize.translate('HeaderRemoveMediaFolder'), function (confirmResult) { + require(['confirm'], function (confirm) { - if (confirmResult) { + confirm(msg, Globalize.translate('HeaderRemoveMediaFolder')).then(function () { var refreshAfterChange = shouldRefreshLibraryAfterChanges(page); ApiClient.removeVirtualFolder(virtualFolder.Name, refreshAfterChange).then(function () { reloadLibrary(page); }); - } - + }); }); }