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 some checks that break server selection

Browse source
This commit is contained in:
dkanada 2019-02-05 03:50:16 +09:00 • committed by Bond-009
parent cdfdfe6e95
commit 5ef781be84
7 changed files with 50 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/apphost.js
View file

@ -140,7 +140,6 @@ define(["appSettings", "browser", "events", "htmlMediaHelper"], function(appSett
(browser.tv || browser.xboxOne || browser.ps4 || browser.mobile) && features.push("physicalvolumecontrol"); (browser.tv || browser.xboxOne || browser.ps4 || browser.mobile) && features.push("physicalvolumecontrol");
browser.tv || browser.xboxOne || browser.ps4 || features.push("remotecontrol"); browser.tv || browser.xboxOne || browser.ps4 || features.push("remotecontrol");
browser.operaTv || browser.tizen || browser.orsay || browser.web0s || browser.edgeUwp || features.push("remotevideo"); browser.operaTv || browser.tizen || browser.orsay || browser.web0s || browser.edgeUwp || features.push("remotevideo");
// might require isNativeApp check if any other issues surface
features.push("displaylanguage"); features.push("displaylanguage");
features.push("otherapppromotions"); features.push("otherapppromotions");
features.push("targetblank"); features.push("targetblank");

18
src/login.html
View file

@ -36,24 +36,20 @@
<div class="visualLoginForm" style="text-align: center;"> <div class="visualLoginForm" style="text-align: center;">
<h1 style="margin-top:1em;">${HeaderPleaseSignIn}</h1> <h1 style="margin-top:1em;">${HeaderPleaseSignIn}</h1>
<div id="divUsers" class="itemsContainer vertical-wrap centered"></div> <div id="divUsers" class="itemsContainer vertical-wrap centered"></div>
<div class="readOnlyContent" style="margin: 2em auto 0;">
<button is="emby-button" type="button" class="raised cancel block btnManual">
<span>${ButtonManualLogin}</span>
</button>
</div>
</div> </div>
<div class="readOnlyContent" style="margin: .5em auto 1em;"> <div class="readOnlyContent" style="margin: .5em auto 1em;">
<button is="emby-button" type="button" class="raised cancel block btnManual">
<span>${ButtonManualLogin}</span>
</button>
<button is="emby-button" type="button" class="raised cancel block btnForgotPassword"> <button is="emby-button" type="button" class="raised cancel block btnForgotPassword">
<span>${ButtonForgotPassword}</span> <span>${ButtonForgotPassword}</span>
</button> </button>
<div class="connectButtons hide"> <a is="emby-linkbutton" href="selectserver.html" class="raised block">
<a is="emby-linkbutton" href="selectserver.html" class="raised block"> <span>${ButtonChangeServer}</span>
<span>${ButtonChangeServer}</span> </a>
</a>
</div>
<p class="disclaimer" style="text-align: center; margin-top: 2em;"></p> <p class="disclaimer" style="text-align: center; margin-top: 2em;"></p>
</div> </div>

43
src/scripts/addpluginpage.js
View file

@ -28,28 +28,27 @@ define(["jQuery", "loading", "libraryMenu", "globalize", "connectionManager", "e
} }
function renderPluginInfo(page, pkg, pluginSecurityInfo) { function renderPluginInfo(page, pkg, pluginSecurityInfo) {
if (!AppInfo.isNativeApp) if (pkg.isPremium) {
if (pkg.isPremium) { $(".premiumPackage", page).show();
$(".premiumPackage", page).show(); var regStatus = "";
var regStatus = ""; if (pkg.isRegistered) regStatus += "<p style='color:green;'>", regStatus += globalize.translate("MessageFeatureIncludedWithSupporter");
if (pkg.isRegistered) regStatus += "<p style='color:green;'>", regStatus += globalize.translate("MessageFeatureIncludedWithSupporter"); else {
else { var expDateTime = new Date(pkg.expDate).getTime(),
var expDateTime = new Date(pkg.expDate).getTime(), nowTime = (new Date).getTime();
nowTime = (new Date).getTime(); expDateTime <= nowTime ? (regStatus += "<p style='color:red;'>", regStatus += globalize.translate("MessageTrialExpired")) : expDateTime > new Date(1970, 1, 1).getTime() && (regStatus += "<p style='color:blue;'>", regStatus += globalize.translate("MessageTrialWillExpireIn").replace("{0}", Math.round(expDateTime - nowTime) / 864e5))
expDateTime <= nowTime ? (regStatus += "<p style='color:red;'>", regStatus += globalize.translate("MessageTrialExpired")) : expDateTime > new Date(1970, 1, 1).getTime() && (regStatus += "<p style='color:blue;'>", regStatus += globalize.translate("MessageTrialWillExpireIn").replace("{0}", Math.round(expDateTime - nowTime) / 864e5)) }
} if (regStatus += "</p>", $("#regStatus", page).html(regStatus), pluginSecurityInfo.IsMBSupporter)
if (regStatus += "</p>", $("#regStatus", page).html(regStatus), pluginSecurityInfo.IsMBSupporter) if ($(".premiumDescription", page).hide(), $(".supporterDescription", page).hide(), pkg.price > 0) {
if ($(".premiumDescription", page).hide(), $(".supporterDescription", page).hide(), pkg.price > 0) { $(".premiumHasPrice", page).show(), $("#featureId", page).val(pkg.featureId), $("#featureName", page).val(pkg.name), $("#amount", page).val(pkg.price), $("#regPrice", page).html("<h3>" + globalize.translate("ValuePriceUSD").replace("{0}", "$" + pkg.price.toFixed(2)) + "</h3>"), $("#ppButton", page).hide();
$(".premiumHasPrice", page).show(), $("#featureId", page).val(pkg.featureId), $("#featureName", page).val(pkg.name), $("#amount", page).val(pkg.price), $("#regPrice", page).html("<h3>" + globalize.translate("ValuePriceUSD").replace("{0}", "$" + pkg.price.toFixed(2)) + "</h3>"), $("#ppButton", page).hide(); var url = "https://mb3admin.local/admin/service/user/getPayPalEmail?id=" + pkg.owner;
var url = "https://mb3admin.local/admin/service/user/getPayPalEmail?id=" + pkg.owner; fetch(url).then(function(response) {
fetch(url).then(function(response) { return response.json()
return response.json() }).then(function(dev) {
}).then(function(dev) { dev.payPalEmail && ($("#payPalEmail", page).val(dev.payPalEmail), $("#ppButton", page).show())
dev.payPalEmail && ($("#payPalEmail", page).val(dev.payPalEmail), $("#ppButton", page).show()) })
}) } else $(".premiumHasPrice", page).hide();
} else $(".premiumHasPrice", page).hide(); else pkg.price ? ($(".premiumDescription", page).show(), $(".supporterDescription", page).hide()) : ($(".premiumDescription", page).hide(), $(".supporterDescription", page).show()), $("#ppButton", page).hide()
else pkg.price ? ($(".premiumDescription", page).show(), $(".supporterDescription", page).hide()) : ($(".premiumDescription", page).hide(), $(".supporterDescription", page).show()), $("#ppButton", page).hide() } else $(".premiumPackage", page).hide()
} else $(".premiumPackage", page).hide()
} }
function renderPackage(pkg, installedPlugins, pluginSecurityInfo, page) { function renderPackage(pkg, installedPlugins, pluginSecurityInfo, page) {

8
src/scripts/librarymenu.js
View file

@ -198,12 +198,10 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
html += "</h3>"; html += "</h3>";
if (user.localUser) { if (user.localUser) {
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkMySettings" href="mypreferencesmenu.html"><i class="md-icon navMenuOptionIcon">settings</i><span class="navMenuOptionText">' + globalize.translate("ButtonSettings") + "</span></a>"; html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkMySettings" href="mypreferencesmenu.html"><i class="md-icon navMenuOptionIcon">settings</i><span class="navMenuOptionText">' + globalize.translate("ButtonSettings") + "</span></a>";
}
if (AppInfo.isNativeApp) {
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" data-itemid="selectserver" href="selectserver.html?showuser=1"><i class="md-icon navMenuOptionIcon">wifi</i><span class="navMenuOptionText">' + globalize.translate("ButtonSelectServer") + "</span></a>"; html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" data-itemid="selectserver" href="selectserver.html?showuser=1"><i class="md-icon navMenuOptionIcon">wifi</i><span class="navMenuOptionText">' + globalize.translate("ButtonSelectServer") + "</span></a>";
} if (!localUser.EnableAutoLogin) {
if (user.localUser && !user.localUser.EnableAutoLogin) { html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnLogout" data-itemid="logout" href="#"><i class="md-icon navMenuOptionIcon">exit_to_app</i><span class="navMenuOptionText">' + globalize.translate("ButtonSignOut") + "</span></a>";
html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnLogout" data-itemid="logout" href="#"><i class="md-icon navMenuOptionIcon">exit_to_app</i><span class="navMenuOptionText">' + globalize.translate("ButtonSignOut") + "</span></a>"; }
} }
html += "</div>"; html += "</div>";

7
src/scripts/loginpage.js
View file

@ -89,9 +89,10 @@ define(["appSettings", "dom", "connectionManager", "loading", "cardStyle", "emby
var apiClient = getApiClient(); var apiClient = getApiClient();
apiClient.getPublicUsers().then(function(users) { apiClient.getPublicUsers().then(function(users) {
users.length ? users.length && users[0].EnableAutoLogin ? authenticateUserByName(view, apiClient, users[0].Name, "") : (showVisualForm(), loadUserList(view, apiClient, users)) : (view.querySelector("#txtManualName").value = "", showManualForm(view, !1, !1)), loading.hide() users.length ? users.length && users[0].EnableAutoLogin ? authenticateUserByName(view, apiClient, users[0].Name, "") : (showVisualForm(), loadUserList(view, apiClient, users)) : (view.querySelector("#txtManualName").value = "", showManualForm(view, !1, !1)), loading.hide()
}), apiClient.getJSON(apiClient.getUrl("Branding/Configuration")).then(function(options) { });
apiClient.getJSON(apiClient.getUrl("Branding/Configuration")).then(function(options) {
view.querySelector(".disclaimer").textContent = options.LoginDisclaimer || "" view.querySelector(".disclaimer").textContent = options.LoginDisclaimer || ""
}), AppInfo.isNativeApp ? view.querySelector(".connectButtons").classList.remove("hide") : view.querySelector(".connectButtons").classList.add("hide") });
}) });
} }
}); });

1
src/scripts/mypreferencescommon.js
View file

@ -21,6 +21,7 @@ define(["apphost", "connectionManager", "listViewStyle", "emby-linkbutton"], fun
} else { } else {
page.querySelector(".selectServer").classList.add("hide"); page.querySelector(".selectServer").classList.add("hide");
} }
connectionManager.user(ApiClient).then(function(user) { connectionManager.user(ApiClient).then(function(user) {
if (user.localUser && !user.localUser.EnableAutoLogin) { if (user.localUser && !user.localUser.EnableAutoLogin) {
view.querySelector(".btnLogout").classList.remove("hide"); view.querySelector(".btnLogout").classList.remove("hide");

20
src/scripts/site.js
View file

@ -57,8 +57,8 @@ var Dashboard = {
onServerChanged: function(userId, accessToken, apiClient) { onServerChanged: function(userId, accessToken, apiClient) {
apiClient = apiClient || window.ApiClient, window.ApiClient = apiClient apiClient = apiClient || window.ApiClient, window.ApiClient = apiClient
}, },
logout: function(logoutWithServer) { logout: function() {
function onLogoutDone() { ConnectionManager.logout().then(function() {
var loginPage; var loginPage;
if (AppInfo.isNativeApp) { if (AppInfo.isNativeApp) {
loginPage = "selectserver.html"; loginPage = "selectserver.html";
@ -67,7 +67,7 @@ var Dashboard = {
loginPage = "login.html"; loginPage = "login.html";
} }
Dashboard.navigate(loginPage); Dashboard.navigate(loginPage);
}!1 === logoutWithServer ? onLogoutDone() : ConnectionManager.logout().then(onLogoutDone) }
}, },
getConfigurationPageUrl: function(name) { getConfigurationPageUrl: function(name) {
return "configurationpage?name=" + encodeURIComponent(name) return "configurationpage?name=" + encodeURIComponent(name)
@ -946,10 +946,18 @@ var Dashboard = {
function onWebComponentsReady(browser) { function onWebComponentsReady(browser) {
var initialDependencies = []; var initialDependencies = [];
window.Promise && !browser.web0s || initialDependencies.push("bower_components/emby-webcomponents/native-promise-only/lib/npo.src"), initRequireWithBrowser(browser), "cordova" !== self.appMode && "android" !== self.appMode || (AppInfo.isNativeApp = !0), require(initialDependencies, init) if (!window.Promise || browser.web0s) {
initialDependencies.push("bower_components/emby-webcomponents/native-promise-only/lib/npo.src");
}
initRequireWithBrowser(browser);
if (self.appMode === 'cordova' || self.appMode === 'android' || self.appMode === 'standalone') {
AppInfo.isNativeApp = true;
}
require(initialDependencies, init);
} }
var localApiClient; var localApiClient;
! function() { return function() {
var urlArgs = "v=" + (window.dashboardVersion || (new Date).getDate()); var urlArgs = "v=" + (window.dashboardVersion || (new Date).getDate());
var bowerPath = getBowerPath(); var bowerPath = getBowerPath();
var apiClientBowerPath = bowerPath + "/emby-apiclient"; var apiClientBowerPath = bowerPath + "/emby-apiclient";
@ -1236,7 +1244,7 @@ var Dashboard = {
}, appRouter.showVideoOsd = function() { }, appRouter.showVideoOsd = function() {
return Dashboard.navigate("videoosd.html") return Dashboard.navigate("videoosd.html")
}, appRouter.showSelectServer = function() { }, appRouter.showSelectServer = function() {
AppInfo.isNativeApp ? Dashboard.navigate("selectserver.html") : Dashboard.navigate("login.html") Dashboard.navigate(AppInfo.isNativeApp ? "selectserver.html" : "login.html")
}, appRouter.showWelcome = function() { }, appRouter.showWelcome = function() {
Dashboard.navigate(AppInfo.isNativeApp ? "selectserver.html" : "login.html") Dashboard.navigate(AppInfo.isNativeApp ? "selectserver.html" : "login.html")
}, appRouter.showSettings = function() { }, appRouter.showSettings = function() {