diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index c1dfea62d8..80d3480fad 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -159,7 +159,7 @@ background: linear-gradient(to bottom, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* W3C */ left: 0; right: 0; - color: inherit; + color: #fff; } .cardText { @@ -173,7 +173,7 @@ } .cardOverlayInner { - color: inherit; + color: #fff; } .cardTextCentered { @@ -188,10 +188,6 @@ text-align: center; } -.libraryPage .cardDefaultText, .libraryPage .cardText { - color: inherit; -} - .cardContent .cardText { padding-left: 5px; padding: 0 5px 4px; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 4e23c5835d..5f0035dc2a 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1277,7 +1277,7 @@ var Dashboard = { SupportsUniqueIdentifier: false }; - window.ConnectionManager = new MediaBrowser.ConnectionManager(credentialProvider, appName, appVersion, deviceName, deviceId, capabilities); + window.ConnectionManager = new MediaBrowser.ConnectionManager(jQuery, Logger, credentialProvider, appName, appVersion, deviceName, deviceId, capabilities); if (Dashboard.isConnectMode()) { $(ConnectionManager).on('apiclientcreated', function (e, apiClient) { @@ -1287,7 +1287,7 @@ var Dashboard = { if (!Dashboard.isServerlessPage()) { if (Dashboard.serverAddress() && Dashboard.getCurrentUserId() && Dashboard.getAccessToken()) { - window.ApiClient = new MediaBrowser.ApiClient(Dashboard.serverAddress(), appName, appVersion, deviceName, deviceId, capabilities); + window.ApiClient = new MediaBrowser.ApiClient(jQuery, Logger, Dashboard.serverAddress(), appName, appVersion, deviceName, deviceId, capabilities); ApiClient.setCurrentUserId(Dashboard.getCurrentUserId(), Dashboard.getAccessToken()); @@ -1301,7 +1301,7 @@ var Dashboard = { } else { - window.ApiClient = new MediaBrowser.ApiClient(Dashboard.serverAddress(), appName, appVersion, deviceName, deviceId, capabilities); + window.ApiClient = new MediaBrowser.ApiClient(jQuery, Logger, Dashboard.serverAddress(), appName, appVersion, deviceName, deviceId, capabilities); ApiClient.setCurrentUserId(Dashboard.getCurrentUserId(), Dashboard.getAccessToken()); diff --git a/dashboard-ui/thirdparty/apiclient/connectionmanager.js b/dashboard-ui/thirdparty/apiclient/connectionmanager.js index 7e303968f8..427bc7d9c4 100644 --- a/dashboard-ui/thirdparty/apiclient/connectionmanager.js +++ b/dashboard-ui/thirdparty/apiclient/connectionmanager.js @@ -1,4 +1,4 @@ -(function (globalScope, $) { +(function (globalScope) { if (!globalScope.MediaBrowser) { globalScope.MediaBrowser = {}; @@ -17,7 +17,9 @@ Remote: 1 }; - globalScope.MediaBrowser.ConnectionManager = function (credentialProvider, appName, appVersion, deviceName, deviceId, capabilities) { + globalScope.MediaBrowser.ConnectionManager = function ($, logger, credentialProvider, appName, appVersion, deviceName, deviceId, capabilities) { + + logger.log('Begin MediaBrowser.ConnectionManager constructor'); var self = this; var apiClients = []; @@ -90,6 +92,15 @@ return apiClients[0]; }; + self.connectUserId = function () { + return credentialProvider.credentials().ConnectUserId; + }; + + self.connectToken = function () { + + return credentialProvider.credentials().ConnectAccessToken; + }; + self.addApiClient = function (apiClient, enableAutomaticNetworking) { apiClients.push(apiClient); @@ -128,7 +139,7 @@ var url = connectionMode == MediaBrowser.ConnectionMode.Local ? server.LocalAddress : server.RemoteAddress; - apiClient = new MediaBrowser.ApiClient(url, appName, appVersion, deviceName, deviceId, capabilities); + apiClient = new MediaBrowser.ApiClient($, logger, url, appName, appVersion, deviceName, deviceId, capabilities); apiClients.push(apiClient); @@ -448,26 +459,17 @@ }); }; - self.connectUserId = function () { - return credentialProvider.credentials().ConnectUserId; - }; - - self.connectToken = function () { - - return credentialProvider.credentials().ConnectAccessToken; - }; - function getConnectServers() { - if (!self.connectToken()) { - throw new Error("null connectToken"); - } - if (!self.connectUserId()) { - throw new Error("null connectUserId"); - } + logger.log('Begin getConnectServers'); var deferred = $.Deferred(); + if (!self.connectToken() || !self.connectUserId()) { + deferred.resolveWith(null, [[]]); + return deferred.promise(); + } + var url = "https://connect.mediabrowser.tv/service/servers?userId=" + self.connectUserId(); $.ajax({ @@ -505,6 +507,8 @@ self.getServers = function () { + logger.log('Begin getServers'); + // Clone the array var credentials = credentialProvider.credentials(); var servers = credentials.servers.slice(0); @@ -519,11 +523,11 @@ return b.DateLastAccessed - a.DateLastAccessed; }); - deferred.resolveWith(null, [newList]); - credentials.servers = newList; credentialProvider.credentials(credentials); + + deferred.resolveWith(null, [newList]); }); return deferred.promise(); @@ -531,6 +535,8 @@ self.connect = function () { + logger.log('Begin connect'); + var deferred = $.Deferred(); self.getServers().done(function (servers) { @@ -916,6 +922,7 @@ }); }; + return self; }; -})(window, jQuery); \ No newline at end of file +})(window, window.jQuery, window.Logger); \ No newline at end of file diff --git a/dashboard-ui/thirdparty/apiclient/credentials.js b/dashboard-ui/thirdparty/apiclient/credentials.js index fb40bad389..67b7f27f90 100644 --- a/dashboard-ui/thirdparty/apiclient/credentials.js +++ b/dashboard-ui/thirdparty/apiclient/credentials.js @@ -1,4 +1,4 @@ -(function (globalScope, store, JSON) { +(function (globalScope, JSON) { if (!globalScope.MediaBrowser) { globalScope.MediaBrowser = {}; @@ -82,4 +82,4 @@ }; }; -})(window, store, window.JSON); \ No newline at end of file +})(window, window.JSON); \ No newline at end of file diff --git a/dashboard-ui/thirdparty/apiclient/device.js b/dashboard-ui/thirdparty/apiclient/device.js index a321a58678..5ccb626cc5 100644 --- a/dashboard-ui/thirdparty/apiclient/device.js +++ b/dashboard-ui/thirdparty/apiclient/device.js @@ -1,4 +1,4 @@ -(function (globalScope, store) { +(function (globalScope) { if (!globalScope.MediaBrowser) { globalScope.MediaBrowser = {}; @@ -27,4 +27,4 @@ return CryptoJS.SHA1(keys.join('|')).toString(); }; -})(window, store); \ No newline at end of file +})(window); \ No newline at end of file diff --git a/dashboard-ui/thirdparty/apiclient/logger.js b/dashboard-ui/thirdparty/apiclient/logger.js new file mode 100644 index 0000000000..ee3cc720a7 --- /dev/null +++ b/dashboard-ui/thirdparty/apiclient/logger.js @@ -0,0 +1,6 @@ +var Logger = { + + log: function (str) { + console.log(str); + } +}; \ No newline at end of file diff --git a/dashboard-ui/thirdparty/apiclient/mediabrowser.apiclient.js b/dashboard-ui/thirdparty/apiclient/mediabrowser.apiclient.js index a2ad59ba91..e921fa0af2 100644 --- a/dashboard-ui/thirdparty/apiclient/mediabrowser.apiclient.js +++ b/dashboard-ui/thirdparty/apiclient/mediabrowser.apiclient.js @@ -1,4 +1,4 @@ -(function (globalScope, $, JSON, WebSocket, setTimeout, devicePixelRatio, FileReader) { +(function (globalScope, JSON, WebSocket, setTimeout, devicePixelRatio, FileReader) { if (!globalScope.MediaBrowser) { globalScope.MediaBrowser = {}; @@ -10,17 +10,17 @@ * @param {String} clientName * @param {String} applicationVersion */ - globalScope.MediaBrowser.ApiClient = function (serverAddress, clientName, applicationVersion, deviceName, deviceId, capabilities) { + globalScope.MediaBrowser.ApiClient = function ($, logger, serverAddress, clientName, applicationVersion, deviceName, deviceId, capabilities) { if (!serverAddress) { throw new Error("Must supply a serverAddress"); } - console.log('ApiClient serverAddress: ' + serverAddress); - console.log('ApiClient clientName: ' + clientName); - console.log('ApiClient applicationVersion: ' + applicationVersion); - console.log('ApiClient deviceName: ' + deviceName); - console.log('ApiClient deviceId: ' + deviceId); + logger.log('ApiClient serverAddress: ' + serverAddress); + logger.log('ApiClient clientName: ' + clientName); + logger.log('ApiClient applicationVersion: ' + applicationVersion); + logger.log('ApiClient deviceName: ' + deviceName); + logger.log('ApiClient deviceId: ' + deviceId); var self = this; var currentUserId; @@ -152,7 +152,7 @@ } if (!self.enableAutomaticNetwork || !self.serverInfo() || self.connectionMode == null) { - console.log('Requesting url without automatic networking: ' + request.url); + logger.log('Requesting url without automatic networking: ' + request.url); return $.ajax(request).fail(onRequestFail); } @@ -184,7 +184,7 @@ self.serverInfo().LocalAddress : self.serverInfo().RemoteAddress; - console.log("Attempting reconnection to " + url); + logger.log("Attempting reconnection to " + url); $.ajax({ @@ -196,7 +196,7 @@ }).done(function () { - console.log("Reconnect succeeeded to " + url); + logger.log("Reconnect succeeeded to " + url); self.connectionMode = connectionMode; self.serverAddress(url); @@ -205,7 +205,7 @@ }).fail(function () { - console.log("Reconnect attempt failed to " + url); + logger.log("Reconnect attempt failed to " + url); if (currentRetryCount <= 6) { @@ -252,7 +252,7 @@ request.url = replaceServerAddress(request.url, baseUrl); } - console.log("Requesting " + request.url); + logger.log("Requesting " + request.url); request.timeout = 15000; @@ -262,7 +262,7 @@ }).fail(function (e, textStatus) { - console.log("Request failed with textStatus " + textStatus + " to " + request.url); + logger.log("Request failed with textStatus " + textStatus + " to " + request.url); var statusCode = parseInt(e.status || '0'); var isUserErrorCode = statusCode >= 400 && statusCode < 500; @@ -271,12 +271,12 @@ if (enableReconnection && !isUserErrorCode) { tryReconnect().done(function () { - console.log("Reconnect succeesed"); + logger.log("Reconnect succeesed"); self.ajaxWithFailover(request, deferred, false, true); }).fail(function () { - console.log("Reconnect failed"); + logger.log("Reconnect failed"); onRetryRequestFail(request); deferred.reject(); @@ -361,7 +361,7 @@ webSocket.onopen = function () { - console.log('web socket connection opened'); + logger.log('web socket connection opened'); setTimeout(function () { self.sendWebSocketMessage("Identity", clientName + "|" + deviceId + "|" + applicationVersion + "|" + deviceName); @@ -392,7 +392,7 @@ self.sendWebSocketMessage = function (name, data) { - console.log('Sending web socket message: ' + name); + logger.log('Sending web socket message: ' + name); var msg = { MessageType: name }; @@ -3403,4 +3403,4 @@ }; -})(window, jQuery, window.JSON, window.WebSocket, window.setTimeout, window.devicePixelRatio, window.FileReader); \ No newline at end of file +})(window, window.JSON, window.WebSocket, window.setTimeout, window.devicePixelRatio, window.FileReader); \ No newline at end of file