milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added more card layouts

Browse source
This commit is contained in:
Luke Pulverenti 2014-11-11 23:51:40 -05:00
parent c6064c9e96
commit 98d59dbc02
15 changed files with 95 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dashboard-ui/thirdparty/apiclient/connectionmanager.js vendored
View file

@ -248,6 +248,13 @@
function addAuthenticationInfoFromConnect(server, connectionMode, credentials) {
if (!server.ExchangeToken) {
throw new Error("server.ExchangeToken cannot be null");
}
if (!credentials.ConnectUserId) {
throw new Error("credentials.ConnectUserId cannot be null");
}
var url = connectionMode == MediaBrowser.ConnectionMode.Local ? server.LocalAddress : server.RemoteAddress;
url += "/mediabrowser/Connect/Exchange?format=json&ConnectUserId=" + credentials.ConnectUserId;
@ -641,7 +648,7 @@
function onEnsureConnectUserDone() {
if (credentials.ConnectUserId && credentials.ConnectAccessToken) {
if (credentials.ConnectUserId && credentials.ConnectAccessToken && server.ExchangeToken) {
addAuthenticationInfoFromConnect(server, connectionMode, credentials).always(onExchangeTokenDone);