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

update translations

Browse source
This commit is contained in:
Luke Pulverenti 2015-01-16 15:54:37 -05:00
parent dd9184c35a
commit 7993ac7213
7 changed files with 61 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/css/card.css
View file

@ -159,7 +159,7 @@
background: linear-gradient(to bottom, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* W3C */ background: linear-gradient(to bottom, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* W3C */
left: 0; left: 0;
right: 0; right: 0;
color: inherit; color: #fff;
} }
.cardText { .cardText {
@ -173,7 +173,7 @@
} }
.cardOverlayInner { .cardOverlayInner {
color: inherit; color: #fff;
} }
.cardTextCentered { .cardTextCentered {
@ -188,10 +188,6 @@
text-align: center; text-align: center;
} }
.libraryPage .cardDefaultText, .libraryPage .cardText {
color: inherit;
}
.cardContent .cardText { .cardContent .cardText {
padding-left: 5px; padding-left: 5px;
padding: 0 5px 4px; padding: 0 5px 4px;

6
dashboard-ui/scripts/site.js
View file

@ -1277,7 +1277,7 @@ var Dashboard = {
SupportsUniqueIdentifier: false 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()) { if (Dashboard.isConnectMode()) {
$(ConnectionManager).on('apiclientcreated', function (e, apiClient) { $(ConnectionManager).on('apiclientcreated', function (e, apiClient) {
@ -1287,7 +1287,7 @@ var Dashboard = {
if (!Dashboard.isServerlessPage()) { if (!Dashboard.isServerlessPage()) {
if (Dashboard.serverAddress() && Dashboard.getCurrentUserId() && Dashboard.getAccessToken()) { 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()); ApiClient.setCurrentUserId(Dashboard.getCurrentUserId(), Dashboard.getAccessToken());
@ -1301,7 +1301,7 @@ var Dashboard = {
} else { } 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()); ApiClient.setCurrentUserId(Dashboard.getCurrentUserId(), Dashboard.getAccessToken());

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

@ -1,4 +1,4 @@
(function (globalScope, $) { (function (globalScope) {
if (!globalScope.MediaBrowser) { if (!globalScope.MediaBrowser) {
globalScope.MediaBrowser = {}; globalScope.MediaBrowser = {};
@ -17,7 +17,9 @@
Remote: 1 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 self = this;
var apiClients = []; var apiClients = [];
@ -90,6 +92,15 @@
return apiClients[0]; return apiClients[0];
}; };
self.connectUserId = function () {
return credentialProvider.credentials().ConnectUserId;
};
self.connectToken = function () {
return credentialProvider.credentials().ConnectAccessToken;
};
self.addApiClient = function (apiClient, enableAutomaticNetworking) { self.addApiClient = function (apiClient, enableAutomaticNetworking) {
apiClients.push(apiClient); apiClients.push(apiClient);
@ -128,7 +139,7 @@
var url = connectionMode == MediaBrowser.ConnectionMode.Local ? server.LocalAddress : server.RemoteAddress; 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); apiClients.push(apiClient);
@ -448,26 +459,17 @@
}); });
}; };
self.connectUserId = function () {
return credentialProvider.credentials().ConnectUserId;
};
self.connectToken = function () {
return credentialProvider.credentials().ConnectAccessToken;
};
function getConnectServers() { function getConnectServers() {
if (!self.connectToken()) { logger.log('Begin getConnectServers');
throw new Error("null connectToken");
}
if (!self.connectUserId()) {
throw new Error("null connectUserId");
}
var deferred = $.Deferred(); 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(); var url = "https://connect.mediabrowser.tv/service/servers?userId=" + self.connectUserId();
$.ajax({ $.ajax({
@ -505,6 +507,8 @@
self.getServers = function () { self.getServers = function () {
logger.log('Begin getServers');
// Clone the array // Clone the array
var credentials = credentialProvider.credentials(); var credentials = credentialProvider.credentials();
var servers = credentials.servers.slice(0); var servers = credentials.servers.slice(0);
@ -519,11 +523,11 @@
return b.DateLastAccessed - a.DateLastAccessed; return b.DateLastAccessed - a.DateLastAccessed;
}); });
deferred.resolveWith(null, [newList]);
credentials.servers = newList; credentials.servers = newList;
credentialProvider.credentials(credentials); credentialProvider.credentials(credentials);
deferred.resolveWith(null, [newList]);
}); });
return deferred.promise(); return deferred.promise();
@ -531,6 +535,8 @@
self.connect = function () { self.connect = function () {
logger.log('Begin connect');
var deferred = $.Deferred(); var deferred = $.Deferred();
self.getServers().done(function (servers) { self.getServers().done(function (servers) {
@ -916,6 +922,7 @@
}); });
}; };
return self;
}; };
})(window, jQuery); })(window, window.jQuery, window.Logger);

4
dashboard-ui/thirdparty/apiclient/credentials.js vendored
View file

@ -1,4 +1,4 @@
(function (globalScope, store, JSON) { (function (globalScope, JSON) {
if (!globalScope.MediaBrowser) { if (!globalScope.MediaBrowser) {
globalScope.MediaBrowser = {}; globalScope.MediaBrowser = {};
@ -82,4 +82,4 @@
}; };
}; };
})(window, store, window.JSON); })(window, window.JSON);

4
dashboard-ui/thirdparty/apiclient/device.js vendored
View file

@ -1,4 +1,4 @@
(function (globalScope, store) { (function (globalScope) {
if (!globalScope.MediaBrowser) { if (!globalScope.MediaBrowser) {
globalScope.MediaBrowser = {}; globalScope.MediaBrowser = {};
@ -27,4 +27,4 @@
return CryptoJS.SHA1(keys.join('|')).toString(); return CryptoJS.SHA1(keys.join('|')).toString();
}; };
})(window, store); })(window);

6
dashboard-ui/thirdparty/apiclient/logger.js vendored Normal file
View file

@ -0,0 +1,6 @@
var Logger = {
log: function (str) {
console.log(str);
}
};

36
dashboard-ui/thirdparty/apiclient/mediabrowser.apiclient.js vendored
View file

@ -1,4 +1,4 @@
(function (globalScope, $, JSON, WebSocket, setTimeout, devicePixelRatio, FileReader) { (function (globalScope, JSON, WebSocket, setTimeout, devicePixelRatio, FileReader) {
if (!globalScope.MediaBrowser) { if (!globalScope.MediaBrowser) {
globalScope.MediaBrowser = {}; globalScope.MediaBrowser = {};
@ -10,17 +10,17 @@
* @param {String} clientName * @param {String} clientName
* @param {String} applicationVersion * @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) { if (!serverAddress) {
throw new Error("Must supply a serverAddress"); throw new Error("Must supply a serverAddress");
} }
console.log('ApiClient serverAddress: ' + serverAddress); logger.log('ApiClient serverAddress: ' + serverAddress);
console.log('ApiClient clientName: ' + clientName); logger.log('ApiClient clientName: ' + clientName);
console.log('ApiClient applicationVersion: ' + applicationVersion); logger.log('ApiClient applicationVersion: ' + applicationVersion);
console.log('ApiClient deviceName: ' + deviceName); logger.log('ApiClient deviceName: ' + deviceName);
console.log('ApiClient deviceId: ' + deviceId); logger.log('ApiClient deviceId: ' + deviceId);
var self = this; var self = this;
var currentUserId; var currentUserId;
@ -152,7 +152,7 @@
} }
if (!self.enableAutomaticNetwork || !self.serverInfo() || self.connectionMode == null) { 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); return $.ajax(request).fail(onRequestFail);
} }
@ -184,7 +184,7 @@
self.serverInfo().LocalAddress : self.serverInfo().LocalAddress :
self.serverInfo().RemoteAddress; self.serverInfo().RemoteAddress;
console.log("Attempting reconnection to " + url); logger.log("Attempting reconnection to " + url);
$.ajax({ $.ajax({
@ -196,7 +196,7 @@
}).done(function () { }).done(function () {
console.log("Reconnect succeeeded to " + url); logger.log("Reconnect succeeeded to " + url);
self.connectionMode = connectionMode; self.connectionMode = connectionMode;
self.serverAddress(url); self.serverAddress(url);
@ -205,7 +205,7 @@
}).fail(function () { }).fail(function () {
console.log("Reconnect attempt failed to " + url); logger.log("Reconnect attempt failed to " + url);
if (currentRetryCount <= 6) { if (currentRetryCount <= 6) {
@ -252,7 +252,7 @@
request.url = replaceServerAddress(request.url, baseUrl); request.url = replaceServerAddress(request.url, baseUrl);
} }
console.log("Requesting " + request.url); logger.log("Requesting " + request.url);
request.timeout = 15000; request.timeout = 15000;
@ -262,7 +262,7 @@
}).fail(function (e, textStatus) { }).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 statusCode = parseInt(e.status || '0');
var isUserErrorCode = statusCode >= 400 && statusCode < 500; var isUserErrorCode = statusCode >= 400 && statusCode < 500;
@ -271,12 +271,12 @@
if (enableReconnection && !isUserErrorCode) { if (enableReconnection && !isUserErrorCode) {
tryReconnect().done(function () { tryReconnect().done(function () {
console.log("Reconnect succeesed"); logger.log("Reconnect succeesed");
self.ajaxWithFailover(request, deferred, false, true); self.ajaxWithFailover(request, deferred, false, true);
}).fail(function () { }).fail(function () {
console.log("Reconnect failed"); logger.log("Reconnect failed");
onRetryRequestFail(request); onRetryRequestFail(request);
deferred.reject(); deferred.reject();
@ -361,7 +361,7 @@
webSocket.onopen = function () { webSocket.onopen = function () {
console.log('web socket connection opened'); logger.log('web socket connection opened');
setTimeout(function () { setTimeout(function () {
self.sendWebSocketMessage("Identity", clientName + "|" + deviceId + "|" + applicationVersion + "|" + deviceName); self.sendWebSocketMessage("Identity", clientName + "|" + deviceId + "|" + applicationVersion + "|" + deviceName);
@ -392,7 +392,7 @@
self.sendWebSocketMessage = function (name, data) { self.sendWebSocketMessage = function (name, data) {
console.log('Sending web socket message: ' + name); logger.log('Sending web socket message: ' + name);
var msg = { MessageType: name }; var msg = { MessageType: name };
@ -3403,4 +3403,4 @@
}; };
})(window, jQuery, window.JSON, window.WebSocket, window.setTimeout, window.devicePixelRatio, window.FileReader); })(window, window.JSON, window.WebSocket, window.setTimeout, window.devicePixelRatio, window.FileReader);