mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

remove useless playback settings alert dialog

Browse source
This commit is contained in:
dkanada 2019-03-29 15:50:16 -07:00
parent 6ca5ad6441
commit ac5b545ce4
13 changed files with 11 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/displaysettings/displaysettings.js
View file

@ -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 '<option value="' + value + '">' + t.name + '</option>';
}).join('');
}
function loadScreensavers(context, userSettings) {
var selectScreensaver = context.querySelector('.selectScreensaver');
var options = pluginManager.ofType('screensaver').map(function (plugin) {
return {

18
src/components/playback/playersettingsmenu.js
View file

@ -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');

28
src/components/skinManager.js
View file

@ -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);
}
});