Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add multiserver support for web client #96

Merged
merged 6 commits into from
Feb 5, 2019
Merged

Add multiserver support for web client #96

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e1b8f57
add multiserver support for web client
dkanada Jan 31, 2019
fabe4c7
remove arbitrary block on plugins for the android app
dkanada Feb 2, 2019
e552e8e
remove some checks that break server selection
dkanada Feb 4, 2019
3f46971
manual deminification for some plugin methods
dkanada Feb 5, 2019
389f15f
remove useless function
dkanada Feb 5, 2019
566ee1c
apply suggestions from code review
JustAMan Feb 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/components/apphost.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 || features.push("remotecontrol");
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("otherapppromotions");
features.push("targetblank");
Expand Down
18 changes: 7 additions & 11 deletions src/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,20 @@ <h1 style="margin-top:1em;text-align: left;">${HeaderPleaseSignIn}</h1>
<div class="visualLoginForm" style="text-align: center;">
<h1 style="margin-top:1em;">${HeaderPleaseSignIn}</h1>
<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 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">
<span>${ButtonForgotPassword}</span>
</button>

<div class="connectButtons hide">
<a is="emby-linkbutton" href="selectserver.html" class="raised block">
<span>${ButtonChangeServer}</span>
</a>
</div>
<a is="emby-linkbutton" href="selectserver.html" class="raised block">
<span>${ButtonChangeServer}</span>
</a>

<p class="disclaimer" style="text-align: center; margin-top: 2em;"></p>
</div>
Expand Down
43 changes: 21 additions & 22 deletions src/scripts/addpluginpage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,27 @@ define(["jQuery", "loading", "libraryMenu", "globalize", "connectionManager", "e
}

function renderPluginInfo(page, pkg, pluginSecurityInfo) {
if (!AppInfo.isNativeApp)
if (pkg.isPremium) {
$(".premiumPackage", page).show();
var regStatus = "";
if (pkg.isRegistered) regStatus += "<p style='color:green;'>", regStatus += globalize.translate("MessageFeatureIncludedWithSupporter");
else {
var expDateTime = new Date(pkg.expDate).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))
}
if (regStatus += "</p>", $("#regStatus", page).html(regStatus), pluginSecurityInfo.IsMBSupporter)
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();
var url = "https://mb3admin.local/admin/service/user/getPayPalEmail?id=" + pkg.owner;
fetch(url).then(function(response) {
return response.json()
}).then(function(dev) {
dev.payPalEmail && ($("#payPalEmail", page).val(dev.payPalEmail), $("#ppButton", page).show())
})
} else $(".premiumHasPrice", page).hide();
else pkg.price ? ($(".premiumDescription", page).show(), $(".supporterDescription", page).hide()) : ($(".premiumDescription", page).hide(), $(".supporterDescription", page).show()), $("#ppButton", page).hide()
} else $(".premiumPackage", page).hide()
if (pkg.isPremium) {
$(".premiumPackage", page).show();
var regStatus = "";
if (pkg.isRegistered) regStatus += "<p style='color:green;'>", regStatus += globalize.translate("MessageFeatureIncludedWithSupporter");
else {
var expDateTime = new Date(pkg.expDate).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))
}
if (regStatus += "</p>", $("#regStatus", page).html(regStatus), pluginSecurityInfo.IsMBSupporter)
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();
var url = "https://mb3admin.local/admin/service/user/getPayPalEmail?id=" + pkg.owner;
fetch(url).then(function(response) {
return response.json()
}).then(function(dev) {
dev.payPalEmail && ($("#payPalEmail", page).val(dev.payPalEmail), $("#ppButton", page).show())
})
} else $(".premiumHasPrice", page).hide();
else pkg.price ? ($(".premiumDescription", page).show(), $(".supporterDescription", page).hide()) : ($(".premiumDescription", page).hide(), $(".supporterDescription", page).show()), $("#ppButton", page).hide()
} else $(".premiumPackage", page).hide()
}

function renderPackage(pkg, installedPlugins, pluginSecurityInfo, page) {
Expand Down
8 changes: 3 additions & 5 deletions src/scripts/librarymenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,10 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
html += "</h3>";
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>";
}
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>";
}
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>";
if (!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 += "</div>";

Expand Down
7 changes: 4 additions & 3 deletions src/scripts/loginpage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,10 @@ define(["appSettings", "dom", "connectionManager", "loading", "cardStyle", "emby
var apiClient = getApiClient();
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()
}), apiClient.getJSON(apiClient.getUrl("Branding/Configuration")).then(function(options) {
});
apiClient.getJSON(apiClient.getUrl("Branding/Configuration")).then(function(options) {
view.querySelector(".disclaimer").textContent = options.LoginDisclaimer || ""
}), AppInfo.isNativeApp ? view.querySelector(".connectButtons").classList.remove("hide") : view.querySelector(".connectButtons").classList.add("hide")
})
});
});
}
});
1 change: 1 addition & 0 deletions src/scripts/mypreferencescommon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ define(["apphost", "connectionManager", "listViewStyle", "emby-linkbutton"], fun
} else {
page.querySelector(".selectServer").classList.add("hide");
}

connectionManager.user(ApiClient).then(function(user) {
if (user.localUser && !user.localUser.EnableAutoLogin) {
view.querySelector(".btnLogout").classList.remove("hide");
Expand Down
20 changes: 14 additions & 6 deletions src/scripts/site.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ var Dashboard = {
onServerChanged: function(userId, accessToken, apiClient) {
apiClient = apiClient || window.ApiClient, window.ApiClient = apiClient
},
logout: function(logoutWithServer) {
function onLogoutDone() {
logout: function() {
ConnectionManager.logout().then(function() {
var loginPage;
if (AppInfo.isNativeApp) {
loginPage = "selectserver.html";
Expand All @@ -67,7 +67,7 @@ var Dashboard = {
loginPage = "login.html";
}
Dashboard.navigate(loginPage);
}!1 === logoutWithServer ? onLogoutDone() : ConnectionManager.logout().then(onLogoutDone)
}
},
getConfigurationPageUrl: function(name) {
return "configurationpage?name=" + encodeURIComponent(name)
Expand Down Expand Up @@ -959,10 +959,18 @@ var Dashboard = {

function onWebComponentsReady(browser) {
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;
! function() {
return function() {
var urlArgs = "v=" + (window.dashboardVersion || (new Date).getDate());
var bowerPath = getBowerPath();
var apiClientBowerPath = bowerPath + "/emby-apiclient";
Expand Down Expand Up @@ -1252,7 +1260,7 @@ var Dashboard = {
}, appRouter.showVideoOsd = function() {
return Dashboard.navigate("videoosd.html")
}, appRouter.showSelectServer = function() {
AppInfo.isNativeApp ? Dashboard.navigate("selectserver.html") : Dashboard.navigate("login.html")
Dashboard.navigate(AppInfo.isNativeApp ? "selectserver.html" : "login.html")
}, appRouter.showWelcome = function() {
Dashboard.navigate(AppInfo.isNativeApp ? "selectserver.html" : "login.html")
}, appRouter.showSettings = function() {
Expand Down