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

add remuxing permission

Browse source
This commit is contained in:
Luke Pulverenti 2016-08-13 18:27:14 -04:00
parent eb9240a835
commit 411561daeb
5 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
View file

@ -128,7 +128,7 @@
html += '<div class="listItemBodyText">' + path + '</div>'; html += '<div class="listItemBodyText">' + path + '</div>';
html += '</div>'; html += '</div>';
html += '<button is="paper-icon-button-light"" class="btnRemovePath" data-index="' + index + '"><i class="md-icon">remove_circle</i></button>'; html += '<button is="paper-icon-button-light"" class="listItemButton btnRemovePath" data-index="' + index + '"><i class="md-icon">remove_circle</i></button>';
html += '</div>'; html += '</div>';

2
dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
View file

@ -67,7 +67,7 @@
html += '</h3>'; html += '</h3>';
html += '</div>'; html += '</div>';
html += '<button is="paper-icon-button-light" class="btnRemovePath" data-index="' + index + '"><i class="md-icon">remove_circle</i></button>'; html += '<button is="paper-icon-button-light" class="listItemButton btnRemovePath" data-index="' + index + '"><i class="md-icon">remove_circle</i></button>';
html += '</div>'; html += '</div>';

12
dashboard-ui/scripts/dashboardgeneral.js
View file

@ -73,8 +73,10 @@
config.CachePath = form.querySelector('#txtCachePath').value; config.CachePath = form.querySelector('#txtCachePath').value;
var requiresReload = false;
if (config.UICulture != currentLanguage) { if (config.UICulture != currentLanguage) {
Dashboard.showDashboardRefreshNotification(); requiresReload = true;
} }
config.EnableAnonymousUsageReporting = $('#chkUsageData', form).checked(); config.EnableAnonymousUsageReporting = $('#chkUsageData', form).checked();
@ -95,12 +97,14 @@
brandingConfig.LoginDisclaimer = form.querySelector('#txtLoginDisclaimer').value; brandingConfig.LoginDisclaimer = form.querySelector('#txtLoginDisclaimer').value;
brandingConfig.CustomCss = form.querySelector('#txtCustomCss').value; brandingConfig.CustomCss = form.querySelector('#txtCustomCss').value;
var cssChanged = currentBrandingOptions && brandingConfig.CustomCss != currentBrandingOptions.CustomCss; if (currentBrandingOptions && brandingConfig.CustomCss != currentBrandingOptions.CustomCss) {
requiresReload = true;
}
ApiClient.updateNamedConfiguration(brandingConfigKey, brandingConfig).then(Dashboard.processServerConfigurationUpdateResult); ApiClient.updateNamedConfiguration(brandingConfigKey, brandingConfig).then(Dashboard.processServerConfigurationUpdateResult);
if (cssChanged) { if (requiresReload && !AppInfo.isNativeApp) {
Dashboard.showDashboardRefreshNotification(); window.location.reload(true);
} }
}); });

4
dashboard-ui/scripts/mediaplayer.js
View file

@ -582,6 +582,10 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
api_key: ApiClient.accessToken() api_key: ApiClient.accessToken()
}; };
if (mediaSource.ETag) {
directOptions.Tag = mediaSource.ETag;
}
if (mediaSource.LiveStreamId) { if (mediaSource.LiveStreamId) {
directOptions.LiveStreamId = mediaSource.LiveStreamId; directOptions.LiveStreamId = mediaSource.LiveStreamId;
} }

12
dashboard-ui/scripts/site.js
View file

@ -154,8 +154,6 @@ var Dashboard = {
if (info.HasPendingRestart) { if (info.HasPendingRestart) {
Dashboard.hideDashboardVersionWarning();
Dashboard.getCurrentUser().then(function (currentUser) { Dashboard.getCurrentUser().then(function (currentUser) {
if (currentUser.Policy.IsAdministrator) { if (currentUser.Policy.IsAdministrator) {
@ -215,16 +213,6 @@ var Dashboard = {
window.location.reload(true); window.location.reload(true);
}, },
hideDashboardVersionWarning: function () {
var elem = document.getElementById('dashboardVersionWarning');
if (elem) {
elem.parentNode.removeChild(elem);
}
},
showFooterNotification: function (options) { showFooterNotification: function (options) {
var removeOnHide = !options.id; var removeOnHide = !options.id;