Merge pull request #435 from grafixeyehero/deletehelper

Change primary highlight for delete confirmation dialog

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' : 'submit'
+            type: options.primary === 'delete' ? 'delete' : 'submit'
         });
 
         options.buttons = items;
@@ -37,4 +37,4 @@ define(['dialog', 'globalize'], function (dialog, globalize) {
             return Promise.reject();
         });
     };
-});
+});

src/components/deletehelper.js

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

src/components/imageeditor/imageeditor.js

@@ -203,7 +203,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
 
                 text: globalize.translate('ConfirmDeleteImage'),
                 confirmText: globalize.translate('Delete'),
-                primary: 'cancel'
+                primary: 'delete'
 
             }).then(afterConfirm);
         });
@@ -471,7 +471,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
 
                 initEditor(dlg, options);
 
-                // Has to be assigned a z-index after the call to .open() 
+                // Has to be assigned a z-index after the call to .open()
                 dlg.addEventListener('close', function () {
 
                     if (layoutManager.tv) {
@@ -510,4 +510,4 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
             });
         }
     };
-});
+});

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: "cancel"
+                primary: "delete"
             }).then(function() {
                 var refreshAfterChange = currentOptions.refresh;
                 ApiClient.removeMediaPath(virtualFolder.Name, location, refreshAfterChange).then(function() {
@@ -212,4 +212,4 @@ define(["loading", "dialogHelper", "dom", "components/libraryoptionseditor/libra
     var isCreating = false;
 
     return editor;
-});
+});

src/components/recordingcreator/recordinghelper.js

@@ -37,7 +37,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
                 confirm({
 
                     text: globalize.translate('MessageConfirmRecordingCancellation'),
-                    primary: 'cancel',
+                    primary: 'delete',
                     confirmText: globalize.translate('HeaderCancelRecording'),
                     cancelText: globalize.translate('HeaderKeepRecording')
 
@@ -62,7 +62,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
                 confirm({
 
                     text: globalize.translate('MessageConfirmRecordingCancellation'),
-                    primary: 'cancel',
+                    primary: 'delete',
                     confirmText: globalize.translate('HeaderCancelSeries'),
                     cancelText: globalize.translate('HeaderKeepSeries')
 

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: 'cancel'
+                primary: 'delete'
 
             }).then(function () {
 
@@ -523,4 +523,4 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
     return {
         show: showEditor
     };
-});
+});

src/components/themes/appletv/theme.css

@@ -101,6 +101,11 @@ html {
     background: #0cb0e8
 }
 
+.button-delete {
+    background: rgb(247, 0, 0);
+    color: rgba(255, 255, 255, .87)
+}
+
 .checkboxLabel {
     color: inherit
 }

src/components/themes/blueradiance/theme.css

@@ -88,6 +88,11 @@ html {
     color: #fff
 }
 
+.button-delete {
+    background: rgb(247, 0, 0);
+    color: rgba(255, 255, 255, .87)
+}
+
 .checkboxLabel {
     color: inherit
 }

src/components/themes/dark/theme.css

@@ -69,6 +69,11 @@ html {
     color: #fff
 }
 
+.button-delete {
+    background: rgb(247, 0, 0);
+    color: rgba(255, 255, 255, .87)
+}
+
 .checkboxLabel {
     color: inherit
 }

src/components/themes/emby/theme.css

@@ -69,6 +69,11 @@ html {
     color: #fff
 }
 
+.button-delete {
+    background: rgb(247, 0, 0);
+    color: rgba(255, 255, 255, .87)
+}
+
 .checkboxLabel {
     color: inherit
 }

src/components/themes/light/theme.css

@@ -84,6 +84,11 @@ html {
     background: #0cb0e8
 }
 
+.button-delete {
+    background: rgb(247, 0, 0);
+    color: rgba(255, 255, 255, .87)
+}
+
 .checkboxLabel {
     color: inherit
 }

src/components/themes/purple-haze/theme.css

@@ -143,6 +143,11 @@ a[data-role=button] {
     background: #ff77f1
 }
 
+.button-delete {
+    background: rgb(247, 0, 0);
+    color: rgba(255, 255, 255, .87)
+}
+
 #btnResetPassword,
 .btnForgotPassword,
 .btnCancel,

src/components/themes/wmc/theme.css

@@ -94,6 +94,11 @@ html {
     color: #fff
 }
 
+.button-delete {
+    background: rgb(247, 0, 0);
+    color: rgba(255, 255, 255, .87)
+}
+
 .checkboxLabel {
     color: inherit
 }