diff --git a/src/components/confirm/confirm.js b/src/components/confirm/confirm.js index a09adcbcf5..f104350c87 100644 --- a/src/components/confirm/confirm.js +++ b/src/components/confirm/confirm.js @@ -18,13 +18,13 @@ define(['dialog', 'globalize'], function (dialog, globalize) { items.push({ name: options.cancelText || globalize.translate('ButtonCancel'), id: 'cancel', - type: options.primary === 'cancel' ? 'submit' : 'cancel' + type: 'cancel' }); items.push({ name: options.confirmText || globalize.translate('ButtonOk'), id: 'ok', - type: options.primary === 'cancel' ? 'cancel' : 'delete' + type: options.primary === 'delete' ? 'delete' : 'submit' }); options.buttons = items; diff --git a/src/components/deletehelper.js b/src/components/deletehelper.js index baea618042..2212fd4437 100644 --- a/src/components/deletehelper.js +++ b/src/components/deletehelper.js @@ -27,7 +27,7 @@ define(['connectionManager', 'confirm', 'appRouter', 'globalize'], function (con title: title, text: msg, confirmText: globalize.translate('Delete'), - primary: 'ok' + primary: 'delete' }).then(function () { diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js index 8cd01b8dbb..15c58ad8d9 100644 --- a/src/components/imageeditor/imageeditor.js +++ b/src/components/imageeditor/imageeditor.js @@ -203,7 +203,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager', text: globalize.translate('ConfirmDeleteImage'), confirmText: globalize.translate('Delete'), - primary: 'ok' + primary: 'delete' }).then(afterConfirm); }); diff --git a/src/components/medialibraryeditor/medialibraryeditor.js b/src/components/medialibraryeditor/medialibraryeditor.js index be5c83f838..77a5f8f459 100644 --- a/src/components/medialibraryeditor/medialibraryeditor.js +++ b/src/components/medialibraryeditor/medialibraryeditor.js @@ -59,7 +59,7 @@ define(["loading", "dialogHelper", "dom", "components/libraryoptionseditor/libra title: Globalize.translate("HeaderRemoveMediaLocation"), text: Globalize.translate("MessageConfirmRemoveMediaLocation"), confirmText: Globalize.translate("ButtonDelete"), - primary: "ok" + primary: "delete" }).then(function() { var refreshAfterChange = currentOptions.refresh; ApiClient.removeMediaPath(virtualFolder.Name, location, refreshAfterChange).then(function() { diff --git a/src/components/subtitleeditor/subtitleeditor.js b/src/components/subtitleeditor/subtitleeditor.js index 3ff7ac14c2..27055f5976 100644 --- a/src/components/subtitleeditor/subtitleeditor.js +++ b/src/components/subtitleeditor/subtitleeditor.js @@ -74,7 +74,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings', title: globalize.translate('ConfirmDeletion'), text: msg, confirmText: globalize.translate('Delete'), - primary: 'ok' + primary: 'delete' }).then(function () { diff --git a/src/controllers/devices.js b/src/controllers/devices.js index 7b0896d575..d50f9ce7e5 100644 --- a/src/controllers/devices.js +++ b/src/controllers/devices.js @@ -12,7 +12,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "hu text: msg, title: globalize.translate("HeaderDeleteDevice"), confirmText: globalize.translate("ButtonDelete"), - primary: "ok" + primary: "delete" }).then(function() { loading.show(), ApiClient.ajax({ type: "DELETE", diff --git a/src/controllers/installedplugins.js b/src/controllers/installedplugins.js index d02fdc0e59..f9653fe260 100644 --- a/src/controllers/installedplugins.js +++ b/src/controllers/installedplugins.js @@ -7,7 +7,7 @@ define(["loading", "libraryMenu", "dom", "globalize", "cardStyle", "emby-button" confirm({ title: globalize.translate("UninstallPluginHeader"), text: msg, - primary: "ok", + primary: "delete", confirmText: globalize.translate("UninstallPluginHeader") }).then(function() { loading.show(); diff --git a/src/controllers/userprofilespage.js b/src/controllers/userprofilespage.js index 8505580904..f76bb35e6a 100644 --- a/src/controllers/userprofilespage.js +++ b/src/controllers/userprofilespage.js @@ -9,7 +9,7 @@ define(["loading", "dom", "globalize", "humanedate", "paper-icon-button-light", title: globalize.translate("DeleteUser"), text: msg, confirmText: globalize.translate("ButtonDelete"), - primary: "ok" + primary: "delete" }).then(function () { loading.show(); ApiClient.deleteUser(id).then(function () {