always keep confirm in the same location

This commit is contained in:
dkanada 2019-09-05 12:41:39 -07:00
parent 6d3c617c28
commit f862838458
8 changed files with 9 additions and 9 deletions

View File

@ -18,13 +18,13 @@ define(['dialog', 'globalize'], function (dialog, globalize) {
items.push({ items.push({
name: options.cancelText || globalize.translate('ButtonCancel'), name: options.cancelText || globalize.translate('ButtonCancel'),
id: 'cancel', id: 'cancel',
type: options.primary === 'cancel' ? 'submit' : 'cancel' type: 'cancel'
}); });
items.push({ items.push({
name: options.confirmText || globalize.translate('ButtonOk'), name: options.confirmText || globalize.translate('ButtonOk'),
id: 'ok', id: 'ok',
type: options.primary === 'cancel' ? 'cancel' : 'delete' type: options.primary === 'delete' ? 'delete' : 'submit'
}); });
options.buttons = items; options.buttons = items;

View File

@ -27,7 +27,7 @@ define(['connectionManager', 'confirm', 'appRouter', 'globalize'], function (con
title: title, title: title,
text: msg, text: msg,
confirmText: globalize.translate('Delete'), confirmText: globalize.translate('Delete'),
primary: 'ok' primary: 'delete'
}).then(function () { }).then(function () {

View File

@ -203,7 +203,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
text: globalize.translate('ConfirmDeleteImage'), text: globalize.translate('ConfirmDeleteImage'),
confirmText: globalize.translate('Delete'), confirmText: globalize.translate('Delete'),
primary: 'ok' primary: 'delete'
}).then(afterConfirm); }).then(afterConfirm);
}); });

View File

@ -59,7 +59,7 @@ define(["loading", "dialogHelper", "dom", "components/libraryoptionseditor/libra
title: Globalize.translate("HeaderRemoveMediaLocation"), title: Globalize.translate("HeaderRemoveMediaLocation"),
text: Globalize.translate("MessageConfirmRemoveMediaLocation"), text: Globalize.translate("MessageConfirmRemoveMediaLocation"),
confirmText: Globalize.translate("ButtonDelete"), confirmText: Globalize.translate("ButtonDelete"),
primary: "ok" primary: "delete"
}).then(function() { }).then(function() {
var refreshAfterChange = currentOptions.refresh; var refreshAfterChange = currentOptions.refresh;
ApiClient.removeMediaPath(virtualFolder.Name, location, refreshAfterChange).then(function() { ApiClient.removeMediaPath(virtualFolder.Name, location, refreshAfterChange).then(function() {

View File

@ -74,7 +74,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
title: globalize.translate('ConfirmDeletion'), title: globalize.translate('ConfirmDeletion'),
text: msg, text: msg,
confirmText: globalize.translate('Delete'), confirmText: globalize.translate('Delete'),
primary: 'ok' primary: 'delete'
}).then(function () { }).then(function () {

View File

@ -12,7 +12,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "hu
text: msg, text: msg,
title: globalize.translate("HeaderDeleteDevice"), title: globalize.translate("HeaderDeleteDevice"),
confirmText: globalize.translate("ButtonDelete"), confirmText: globalize.translate("ButtonDelete"),
primary: "ok" primary: "delete"
}).then(function() { }).then(function() {
loading.show(), ApiClient.ajax({ loading.show(), ApiClient.ajax({
type: "DELETE", type: "DELETE",

View File

@ -7,7 +7,7 @@ define(["loading", "libraryMenu", "dom", "globalize", "cardStyle", "emby-button"
confirm({ confirm({
title: globalize.translate("UninstallPluginHeader"), title: globalize.translate("UninstallPluginHeader"),
text: msg, text: msg,
primary: "ok", primary: "delete",
confirmText: globalize.translate("UninstallPluginHeader") confirmText: globalize.translate("UninstallPluginHeader")
}).then(function() { }).then(function() {
loading.show(); loading.show();

View File

@ -9,7 +9,7 @@ define(["loading", "dom", "globalize", "humanedate", "paper-icon-button-light",
title: globalize.translate("DeleteUser"), title: globalize.translate("DeleteUser"),
text: msg, text: msg,
confirmText: globalize.translate("ButtonDelete"), confirmText: globalize.translate("ButtonDelete"),
primary: "ok" primary: "delete"
}).then(function () { }).then(function () {
loading.show(); loading.show();
ApiClient.deleteUser(id).then(function () { ApiClient.deleteUser(id).then(function () {