diff --git a/src/components/apphost.js b/src/components/apphost.js index 619cd298b7..9cffd2d8a4 100644 --- a/src/components/apphost.js +++ b/src/components/apphost.js @@ -143,6 +143,7 @@ define(["appSettings", "browser", "events", "htmlMediaHelper"], function(appSett features.push("displaylanguage"); features.push("otherapppromotions"); features.push("targetblank"); + // allows users to connect to more than one server //features.push("multiserver"); browser.orsay || browser.tizen || browser.msie || !(browser.firefox || browser.ps4 || browser.edge || cueSupported()) || features.push("subtitleappearancesettings"); browser.orsay || browser.tizen || features.push("subtitleburnsettings"); diff --git a/src/dashboard/dashboardgeneral.js b/src/dashboard/dashboardgeneral.js index cf9d58f3dd..c2f48a2803 100644 --- a/src/dashboard/dashboardgeneral.js +++ b/src/dashboard/dashboardgeneral.js @@ -10,8 +10,8 @@ define(["jQuery", "loading", "fnchecked", "emby-checkbox", "emby-textarea", "emb page.querySelector("#txtCachePath").value = config.CachePath || ""; $("#txtMetadataPath", page).val(config.MetadataPath || ""); $("#txtMetadataNetworkPath", page).val(config.MetadataNetworkPath || ""); - $("#selectLocalizationLanguage", page).html(languageOptions.map(function(l) { - return '" + $("#selectLocalizationLanguage", page).html(languageOptions.map(function(language) { + return '" })).val(config.UICulture); currentLanguage = config.UICulture; if (systemInfo.CanSelfUpdate) { @@ -43,10 +43,7 @@ define(["jQuery", "loading", "fnchecked", "emby-checkbox", "emby-textarea", "emb config.CachePath = form.querySelector("#txtCachePath").value; config.MetadataPath = $("#txtMetadataPath", form).val(); config.MetadataNetworkPath = $("#txtMetadataNetworkPath", form).val(); - var requiresReload = false; - if (config.UICulture !== currentLanguage) { - requiresReload = true; - } + var requiresReload = (config.UICulture !== currentLanguage); config.EnableAutomaticRestart = $("#chkEnableAutomaticRestart", form).checked(); config.EnableAutoUpdate = $("#chkEnableAutomaticServerUpdates", form).checked(); ApiClient.updateServerConfiguration(config).then(function() { diff --git a/src/dashboard/livetvtuner.js b/src/dashboard/livetvtuner.js index 1cc806d05b..8d27093af1 100644 --- a/src/dashboard/livetvtuner.js +++ b/src/dashboard/livetvtuner.js @@ -8,12 +8,14 @@ define(["globalize", "loading", "libraryMenu", "dom", "emby-input", "emby-button function fillTypes(view, currentId) { ApiClient.getJSON(ApiClient.getUrl("LiveTv/TunerHosts/Types")).then(function(types) { var selectType = view.querySelector(".selectType"); - selectType.innerHTML = types.map(function(t) { - return '"; + var html = ""; + html += types.map(function(tuner) { + return '"; }).join(""); - selectType.innerHTML += '"; + html += '"; + selectType.innerHTML = html; selectType.disabled = null != currentId; selectType.value = ""; @@ -39,9 +41,10 @@ define(["globalize", "loading", "libraryMenu", "dom", "emby-input", "emby-button var selectType = view.querySelector(".selectType"); var type = info.Type || ""; if (info.Source && isM3uVariant(info.Source)) { - selectType.value = info.Source; - onTypeChange.call(selectType); + type = info.Source; } + selectType.value = type; + onTypeChange.call(selectType); view.querySelector(".txtDevicePath").value = info.Url || ""; view.querySelector(".txtFriendlyName").value = info.FriendlyName || ""; view.querySelector(".txtUserAgent").value = info.UserAgent || ""; diff --git a/src/scripts/notificationsettings.js b/src/scripts/notificationsettings.js index 317abce620..b167ca00e4 100644 --- a/src/scripts/notificationsettings.js +++ b/src/scripts/notificationsettings.js @@ -7,10 +7,10 @@ define(["loading", "libraryMenu", "globalize", "listViewStyle", "emby-linkbutton var html = ""; var lastCategory = ""; var showHelp = true; - html += list.map(function(i) { + html += list.map(function(notification) { var itemHtml = ""; - if (i.Category !== lastCategory) { - lastCategory = i.Category; + if (notification.Category !== lastCategory) { + lastCategory = notification.Category; if (lastCategory) { itemHtml += ""; itemHtml += ""; @@ -18,7 +18,7 @@ define(["loading", "libraryMenu", "globalize", "listViewStyle", "emby-linkbutton itemHtml += '