diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index b8b34c1a7..bb1afabfd 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -39,6 +39,7 @@ - [GuilhermeHideki](https://github.com/GuilhermeHideki) - [Andrei Oanca](https://github.com/OancaAndrei) - [Cromefire_](https://github.com/cromefire) + - [Orry Verducci](https://github.com/orryverducci) # Emby Contributors diff --git a/package.json b/package.json index 4dc74d627..5ca5c1515 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "css-loader": "^4.2.2", "cssnano": "^4.1.10", "del": "^5.1.0", - "eslint": "^7.8.0", + "eslint": "^7.8.1", "eslint-plugin-compat": "^3.5.1", "eslint-plugin-eslint-comments": "^3.2.0", "eslint-plugin-import": "^2.21.2", diff --git a/src/components/listview/listview.css b/src/components/listview/listview.css index 1e485a80e..063eb74de 100644 --- a/src/components/listview/listview.css +++ b/src/components/listview/listview.css @@ -185,6 +185,17 @@ .listItemBody { padding-right: 0.5em; } + + .listItemMediaInfo { + display: none; + } +} + +@media all and (max-width: 40em) { + [data-type='Movie'] .listItemImage, + [data-type='Series'] .listItemImage { + display: none; + } } .listItemImage-large-tv { diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js index 455495641..82bce8075 100644 --- a/src/components/playback/playbackmanager.js +++ b/src/components/playback/playbackmanager.js @@ -639,22 +639,18 @@ function supportsDirectPlay(apiClient, item, mediaSource) { function validatePlaybackInfoResult(instance, result) { if (result.ErrorCode) { - showPlaybackInfoErrorMessage(instance, result.ErrorCode); + showPlaybackInfoErrorMessage(instance, 'PlaybackError' + result.ErrorCode); return false; } return true; } -function showPlaybackInfoErrorMessage(instance, errorCode, playNextTrack) { +function showPlaybackInfoErrorMessage(instance, errorCode) { import('alert').then(({ default: alert }) => { alert({ - text: globalize.translate('PlaybackError' + errorCode), + text: globalize.translate(errorCode), title: globalize.translate('HeaderPlaybackError') - }).then(function () { - if (playNextTrack) { - instance.nextTrack(); - } }); }); } @@ -1701,7 +1697,7 @@ class PlaybackManager { streamInfo.lastMediaInfoQuery = lastMediaInfoQuery; if (!streamInfo.url) { - showPlaybackInfoErrorMessage(self, 'NoCompatibleStream', true); + showPlaybackInfoErrorMessage(self, 'PlaybackErrorNoCompatibleStream'); return; } @@ -2061,7 +2057,7 @@ class PlaybackManager { // If it's still null then there's nothing to play if (!firstItem) { - showPlaybackInfoErrorMessage(self, 'NoCompatibleStream', false); + showPlaybackInfoErrorMessage(self, 'PlaybackErrorNoCompatibleStream'); return Promise.reject(); } @@ -2110,7 +2106,7 @@ class PlaybackManager { function playInternal(item, playOptions, onPlaybackStartedFn) { if (item.IsPlaceHolder) { loading.hide(); - showPlaybackInfoErrorMessage(self, 'PlaceHolder', true); + showPlaybackInfoErrorMessage(self, 'PlaybackErrorPlaceHolder'); return Promise.reject(); } @@ -2479,7 +2475,7 @@ class PlaybackManager { return mediaSource; } } else { - showPlaybackInfoErrorMessage(self, 'NoCompatibleStream'); + showPlaybackInfoErrorMessage(self, 'PlaybackErrorNoCompatibleStream'); return Promise.reject(); } }); @@ -2968,7 +2964,7 @@ class PlaybackManager { } if (displayErrorCode && typeof (displayErrorCode) === 'string') { - showPlaybackInfoErrorMessage(self, displayErrorCode, nextItem); + showPlaybackInfoErrorMessage(self, 'PlaybackError' + displayErrorCode); } else if (nextItem) { self.nextTrack(); } else { diff --git a/src/controllers/dashboard/dlna/profile.html b/src/controllers/dashboard/dlna/profile.html index 1850076a7..22edffed9 100644 --- a/src/controllers/dashboard/dlna/profile.html +++ b/src/controllers/dashboard/dlna/profile.html @@ -33,11 +33,11 @@ - ${OptionProfilePhoto} + ${Photo} - ${OptionProfileVideo} + ${Video} @@ -144,19 +144,19 @@
${HeaderCodecProfileHelp}
http://example.com/<baseurl>