diff --git a/src/components/displaysettings/displaysettings.js b/src/components/displaysettings/displaysettings.js index 680c6b634b..fea7d9bd3e 100644 --- a/src/components/displaysettings/displaysettings.js +++ b/src/components/displaysettings/displaysettings.js @@ -2,25 +2,19 @@ define(['require', 'browser', 'layoutManager', 'appSettings', 'pluginManager', ' "use strict"; function fillThemes(select, isDashboard) { - select.innerHTML = skinManager.getThemes().map(function (t) { - var value = t.id; - if (t.isDefault && !isDashboard) { value = ''; - } - else if (t.isDefaultServerDashboard && isDashboard) { + } else if (t.isDefaultServerDashboard && isDashboard) { value = ''; } return ''; - }).join(''); } function loadScreensavers(context, userSettings) { - var selectScreensaver = context.querySelector('.selectScreensaver'); var options = pluginManager.ofType('screensaver').map(function (plugin) { return { diff --git a/src/components/playback/playersettingsmenu.js b/src/components/playback/playersettingsmenu.js index b51027fe0f..b0c4609217 100644 --- a/src/components/playback/playersettingsmenu.js +++ b/src/components/playback/playersettingsmenu.js @@ -196,11 +196,6 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob }); } - menuItems.push({ - name: globalize.translate('PlaybackSettings'), - id: 'playbacksettings' - }); - if (user && user.Policy.EnableVideoPlaybackTranscoding) { var secondaryQualityText = getQualitySecondaryText(player); @@ -214,7 +209,6 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob var repeatMode = playbackManager.getRepeatMode(player); if (supportedCommands.indexOf('SetRepeatMode') !== -1 && playbackManager.currentMediaSource(player).RunTimeTicks) { - menuItems.push({ name: globalize.translate('RepeatMode'), id: 'repeatmode', @@ -223,7 +217,6 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob } if (options.stats) { - menuItems.push({ name: globalize.translate('StatsForNerds'), id: 'stats', @@ -237,12 +230,9 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob }); return actionsheet.show({ - items: menuItems, positionTo: options.positionTo - }).then(function (id) { - return handleSelectedOption(id, options, player); }); } @@ -279,14 +269,8 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob return alertText(globalize.translate('SubtitleSettingsIntro')); } - function showPlaybackSettings(player, btn) { - return alertText(globalize.translate('PlaybackSettingsIntro')); - } - function handleSelectedOption(id, options, player) { - switch (id) { - case 'quality': return showQualityMenu(player, options.positionTo); case 'aspectratio': @@ -295,8 +279,6 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob return showRepeatModeMenu(player, options.positionTo); case 'subtitlesettings': return showSubtitleSettings(player, options.positionTo); - case 'playbacksettings': - return showPlaybackSettings(player, options.positionTo); case 'stats': if (options.onOption) { options.onOption('stats'); diff --git a/src/components/skinManager.js b/src/components/skinManager.js index 82e3a50e56..a9af80a878 100644 --- a/src/components/skinManager.js +++ b/src/components/skinManager.js @@ -7,7 +7,6 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr function unloadTheme() { var elem = themeStyleElement; if (elem) { - elem.parentNode.removeChild(elem); themeStyleElement = null; currentThemeId = null; @@ -16,7 +15,6 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr function loadUserSkin(options) { options = options || {}; - if (options.start) { Emby.Page.invokeShortcut(options.start); } else { @@ -40,10 +38,10 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr name: "Dark Classic", id: "dark-classic", }, { - name: "Dark (green accent)", + name: "Dark (Green Accent)", id: "dark-green" }, { - name: "Dark (red accent)", + name: "Dark (Red Accent)", id: "dark-red" }, { name: "Light", @@ -52,19 +50,19 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr name: "Light Classic", id: "light-classic" }, { - name: "Light (blue accent)", + name: "Light (Blue Accent)", id: "light-blue" }, { - name: "Light (green accent)", + name: "Light (Green Accent)", id: "light-green" }, { - name: "Light (pink accent)", + name: "Light (Pink Accent)", id: "light-pink" }, { - name: "Light (purple accent)", + name: "Light (Purple Accent)", id: "light-purple" }, { - name: "Light (red accent)", + name: "Light (Red Accent)", id: "light-red" }, { name: "Windows Media Center", @@ -77,7 +75,7 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr loadUserSkin: loadUserSkin }; - function getThemeStylesheetInfo(id, requiresRegistration, isDefaultProperty) { + function getThemeStylesheetInfo(id, isDefaultProperty) { var themes = skinManager.getThemes(); var defaultTheme; var selectedTheme; @@ -128,14 +126,13 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr skinManager.setTheme = function (id, context) { return new Promise(function (resolve, reject) { - var requiresRegistration = true; if (currentThemeId && currentThemeId === id) { resolve(); return; } var isDefaultProperty = context === 'serverdashboard' ? 'isDefaultServerDashboard' : 'isDefault'; - var info = getThemeStylesheetInfo(id, requiresRegistration, isDefaultProperty); + var info = getThemeStylesheetInfo(id, isDefaultProperty); if (currentThemeId && currentThemeId === info.themeId) { resolve(); return; @@ -187,21 +184,16 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr document.addEventListener('viewshow', onViewBeforeShow); function playSound(path, volume) { - lastSound = new Date().getTime(); - require(['howler'], function (howler) { - try { var sound = new Howl({ src: [path], volume: volume || 0.1 }); - sound.play(); currentSound = sound; - } - catch (err) { + } catch (err) { console.log('Error playing sound: ' + err); } }); diff --git a/src/strings/de.json b/src/strings/de.json index 6c93871eb4..771412306e 100644 --- a/src/strings/de.json +++ b/src/strings/de.json @@ -1077,7 +1077,6 @@ "PlayFromBeginning": "Von Beginn abspielen", "PlayNext": "Spiele als Nächstes ab", "PlayNextEpisodeAutomatically": "Starte nächste Episode automatisch", - "PlaybackSettingsIntro": "Um die Wiedergabeeinstellungen zu ändern, stoppen Sie die Wiedergabe und klicken Sie auf Ihr Benutzer-Icon in der oberen rechten Ecke der App.", "Played": "Gesehen", "Playlists": "Wiedergabelisten", "PleaseAddAtLeastOneFolder": "Bitte fügen Sie mindestens ein Verzeichniss zur Bibliothek durch Klicken der \"Hinzufügen\"-Schaltfläche hinzu.", @@ -1387,7 +1386,6 @@ "OptionRegex": "Reguläre Ausdrücke", "OptionSpecialEpisode": "Extras", "OptionTrackName": "Spurname", - "PlaybackSettings": "Wiedergabeeinstellungen", "Screenshots": "Bildschirmfotos", "Studios": "Studios", "SubtitleSettings": "Untertiteleinstellungen", diff --git a/src/strings/el.json b/src/strings/el.json index 325ab2fbc7..a817591666 100644 --- a/src/strings/el.json +++ b/src/strings/el.json @@ -970,7 +970,6 @@ "PlayFromBeginning": "Αναπαραγωγή από την αρχή", "PlayNext": "Επόμενη Αναπαραγωγή", "PlayNextEpisodeAutomatically": "Αναπαραγωγή του επόμενου επεισοδίου αυτόματα", - "PlaybackSettingsIntro": "Για να ρυθμίσετε τις προεπιλεγμένες ρυθμίσεις αναπαραγωγής, σταματήστε την αναπαραγωγή βίντεο και στη συνέχεια, κάντε κλικ στο εικονίδιο χρήστη στην επάνω δεξιά ενότητα της εφαρμογής.", "Played": "Έγινε Αναπαραγωγή", "Playlists": "Λίστες αναπαραγωγής", "PleaseConfirmPluginInstallation": "Παρακαλώ κάντε κλικ στο OK για να επιβεβαιώσετε ότι έχετε διαβάσει τα ανωτέρω και επιθυμείτε να προχωρήσετε με την εγκατάσταση του πρόσθετου.", diff --git a/src/strings/en-us.json b/src/strings/en-us.json index d39c7f9eae..7f79d37ecc 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -1191,8 +1191,6 @@ "PlayFromBeginning": "Play from beginning", "PlayNext": "Play next", "PlayNextEpisodeAutomatically": "Play next episode automatically", - "PlaybackSettings": "Playback settings", - "PlaybackSettingsIntro": "To configure default playback settings, stop video playback, then click your user icon in the top right section of the app.", "Played": "Played", "Playlists": "Playlists", "PleaseAddAtLeastOneFolder": "Please add at least one folder to this library by clicking the Add button.", diff --git a/src/strings/es-mx.json b/src/strings/es-mx.json index 445ba02c6e..9eb68484b1 100644 --- a/src/strings/es-mx.json +++ b/src/strings/es-mx.json @@ -1141,8 +1141,6 @@ "PlayFromBeginning": "Reproducir desde el inicio", "PlayNext": "Reproducir siguiente", "PlayNextEpisodeAutomatically": "Reproducir el siguiente episodio automáticamente", - "PlaybackSettings": "Configuraciones de Reproducción", - "PlaybackSettingsIntro": "Para configurar las opciones de reproducción predeterminadas, detenga la reproducción de video. entonces de clic en su icono de usuario en la esquina superior derecha de la aplicación.", "Played": "Reproducido", "Playlists": "Listas de reproducción", "PleaseAddAtLeastOneFolder": "Por favor agregue al menos una carpeta a esta biblioteca dando clic al botón de Agregar.", diff --git a/src/strings/fr.json b/src/strings/fr.json index 171837cceb..b3b77df90b 100644 --- a/src/strings/fr.json +++ b/src/strings/fr.json @@ -1135,8 +1135,6 @@ "PlayFromBeginning": "Lire depuis le début", "PlayNext": "Lire le suivant", "PlayNextEpisodeAutomatically": "Lancer l'épisode suivant automatiquement", - "PlaybackSettings": "Paramètres de lecture", - "PlaybackSettingsIntro": "Pour configurer les réglages de lecture par défaut, arrêtez la lecture de la vidéo, puis cliquez sur votre icône utilisateur située en haut à droite dans l'application.", "Played": "Lu", "Playlists": "Listes de lecture", "PleaseAddAtLeastOneFolder": "Veuillez ajouter au moins un dossier à cette médiathèque en cliquant sur le bouton Ajouter.", diff --git a/src/strings/hu.json b/src/strings/hu.json index ac181eee61..902ae1bc03 100644 --- a/src/strings/hu.json +++ b/src/strings/hu.json @@ -1208,8 +1208,6 @@ "PlaceFavoriteChannelsAtBeginning": "Helyezd el a kedvenc csatornákat az elején", "PlayFromBeginning": "Lejátszás az elejétől", "PlayNext": "Következő lejátszása", - "PlaybackSettings": "Lejátszási beállítások", - "PlaybackSettingsIntro": "Az alapértelmezett lejátszási beállítások konfigurálásához állítsd le a videót, majd kattints a felhasználói ikonra az alkalmazás jobb felső részén.", "PleaseAddAtLeastOneFolder": "Adj hozzá legalább egy mappát ehhez a könyvtárhoz a Hozzáad gombra kattintva.", "PleaseConfirmPluginInstallation": "Kérlek kattints az OK gombra, hogy megerősítsd, hogy elolvastad a fentieket és folytatni kívánod a bővítmény telepítését.", "PleaseEnterNameOrId": "Kérlek adj meg egy nevet vagy egy külső ID-t.", diff --git a/src/strings/kk.json b/src/strings/kk.json index 6e19e43eb9..2c5361ce4c 100644 --- a/src/strings/kk.json +++ b/src/strings/kk.json @@ -1165,7 +1165,6 @@ "PlayFromBeginning": "Basynan oınatý", "PlayNext": "Kelesini oınatý", "PlayNextEpisodeAutomatically": "Kelesi bólimdi avtomatty júktep alý", - "PlaybackSettingsIntro": "Ádepki oınatý parametrlerin teńsheý úshin beıne oınatýdy toqtatyńyz, sodan keıin qoldanbanyń joǵarǵy oń jaq bóligindegi paıdalanýshy belgishesin basyńyz.", "Played": "Oınatylǵan", "Playlists": "Oınatý tizimderi", "PleaseAddAtLeastOneFolder": "Qosý túımeshigin basý arqyly, osy tasyǵyshhanaǵa kem degende bir qalta qosyńyz.", @@ -1418,6 +1417,5 @@ "MessageImageFileTypeAllowed": "Tek qana JPEG jáne PNG faıldary qoldaýda.", "MessageImageTypeNotSelected": "Sýret túrin ashylmaly mázirden tandańyz.", "OptionResElement": "res elementi", - "PlaybackSettings": "Oınatý parametrleri", "SubtitleSettings": "Sýbtıtrler parametrleri" } diff --git a/src/strings/nl.json b/src/strings/nl.json index f6b8e45970..d346531692 100644 --- a/src/strings/nl.json +++ b/src/strings/nl.json @@ -1075,7 +1075,6 @@ "PlayFromBeginning": "Afspelen vanaf begin", "PlayNext": "Volgende afspelen", "PlayNextEpisodeAutomatically": "Speel volgende aflevering automatisch", - "PlaybackSettingsIntro": "Om de standaard afspeelinstellingen te configureren, stopt u het afspelen van de video. Vervolgens klikt u op het gebruikersicoon in de rechterbovenhoek van de app.", "Played": "Afgespeeld", "Playlists": "Afspeellijsten", "PleaseAddAtLeastOneFolder": "Voeg tenminste 1 map aan deze bibliotheek toe door op de Toevoegen knop te klikken.", diff --git a/src/strings/pl.json b/src/strings/pl.json index 7e41d6ca9f..0e28cbb3a1 100644 --- a/src/strings/pl.json +++ b/src/strings/pl.json @@ -1156,8 +1156,6 @@ "PlayFromBeginning": "Odtwarzaj od początku", "PlayNext": "Odtwarzaj następne", "PlayNextEpisodeAutomatically": "Odtwarzaj następny odcinek automatycznie", - "PlaybackSettings": "Ustawienia odtwarzania", - "PlaybackSettingsIntro": "W celu skonfigurowania domyślnych ustawień odtwarzania, zatrzymaj odtwarzanie, a następnie naciśnij ikonę użytkownika w górnej prawej sekcji aplikacji.", "Played": "Odtworzone", "Playlists": "Listy", "PleaseAddAtLeastOneFolder": "Proszę dodaj przynajmniej jeden folder do tej listy poprzez kliknięcie guzika Dodaj", diff --git a/src/strings/ru.json b/src/strings/ru.json index 673942bc09..a3b7046e15 100644 --- a/src/strings/ru.json +++ b/src/strings/ru.json @@ -1165,7 +1165,6 @@ "PlayFromBeginning": "Воспр. с начала", "PlayNext": "Воспроизвести следующее", "PlayNextEpisodeAutomatically": "Воспроизводить последующий эпизод автоматически", - "PlaybackSettingsIntro": "Чтобы конфигурировать параметры воспроизведения по умолчанию, остановите воспроизведение видео, затем щелкните значок пользователя в правой верхней части приложения.", "Played": "Воспроизведено", "Playlists": "Плей-листы", "PleaseAddAtLeastOneFolder": "Добавьте, по крайней мере, одну папку к данной медиатеке, нажав кнопку Добавить.", @@ -1418,7 +1417,6 @@ "LeaveBlankToNotSetAPassword": "Необязательно - оставьте пустым, чтобы не назначать пароль", "MessageImageFileTypeAllowed": "Поддерживаются только файлы JPEG и PNG.", "MessageImageTypeNotSelected": "Выберите тип рисунка из выпадающего меню.", - "PlaybackSettings": "Параметры воспроизведения", "SubtitleSettings": "Параметры субтитров", "OptionResElement": "res-элемент" }