diff --git a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js index f7d1dbea0c..45695dfee3 100644 --- a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js +++ b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js @@ -128,7 +128,7 @@ html += '
' + path + '
'; html += ''; - html += ''; + html += ''; html += ''; diff --git a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js index 0d972f3c0d..ba0d8856fe 100644 --- a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js +++ b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js @@ -67,7 +67,7 @@ html += ''; html += ''; - html += ''; + html += ''; html += ''; diff --git a/dashboard-ui/scripts/dashboardgeneral.js b/dashboard-ui/scripts/dashboardgeneral.js index 847dbe9050..7d7f51d313 100644 --- a/dashboard-ui/scripts/dashboardgeneral.js +++ b/dashboard-ui/scripts/dashboardgeneral.js @@ -73,8 +73,10 @@ config.CachePath = form.querySelector('#txtCachePath').value; + var requiresReload = false; + if (config.UICulture != currentLanguage) { - Dashboard.showDashboardRefreshNotification(); + requiresReload = true; } config.EnableAnonymousUsageReporting = $('#chkUsageData', form).checked(); @@ -95,12 +97,14 @@ brandingConfig.LoginDisclaimer = form.querySelector('#txtLoginDisclaimer').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); - if (cssChanged) { - Dashboard.showDashboardRefreshNotification(); + if (requiresReload && !AppInfo.isNativeApp) { + window.location.reload(true); } }); diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 6754563ff2..3d81369d99 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -582,6 +582,10 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS api_key: ApiClient.accessToken() }; + if (mediaSource.ETag) { + directOptions.Tag = mediaSource.ETag; + } + if (mediaSource.LiveStreamId) { directOptions.LiveStreamId = mediaSource.LiveStreamId; } diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 5a0e8bcb00..59371218dd 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -154,8 +154,6 @@ var Dashboard = { if (info.HasPendingRestart) { - Dashboard.hideDashboardVersionWarning(); - Dashboard.getCurrentUser().then(function (currentUser) { if (currentUser.Policy.IsAdministrator) { @@ -215,16 +213,6 @@ var Dashboard = { window.location.reload(true); }, - hideDashboardVersionWarning: function () { - - var elem = document.getElementById('dashboardVersionWarning'); - - if (elem) { - - elem.parentNode.removeChild(elem); - } - }, - showFooterNotification: function (options) { var removeOnHide = !options.id;