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 <br/> from parsed subtitles

Browse source
This commit is contained in:
Luke Pulverenti 2014-06-13 10:24:14 -04:00
parent 462766c0db
commit 53c6887c71
3 changed files with 46 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,8 +2,34 @@
window.MediaBrowser = {};
}
MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, window, FileReader) {
MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, window, FileReader, localStorage) {
function generateDeviceId() {
var keys = [];
keys.push(navigator.userAgent);
keys.push((navigator.cpuClass || ""));
var randomId = '';
if (localStorage) {
// Since the above is not guaranteed to be unique per device, add a little more
randomId = localStorage.getItem('randomId');
if (!randomId) {
randomId = new Date().getTime();
localStorage.setItem('randomId', randomId);
}
}
keys.push(randomId);
return MediaBrowser.SHA1(keys.join('|'));
}
/**
* Creates a new api client instance
* @param {String} serverAddress
@ -18,7 +44,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
var self = this;
var deviceName = "Web Browser";
var deviceId = MediaBrowser.SHA1(navigator.userAgent + (navigator.cpuClass || ""));
var deviceId = generateDeviceId();
var currentUserId;
var webSocket;
@ -3155,7 +3181,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
};
}(jQuery, navigator, window.JSON, window.WebSocket, setTimeout, window, window.FileReader);
}(jQuery, navigator, window.JSON, window.WebSocket, setTimeout, window, window.FileReader, window.localStorage);
/**
* Provides a friendly way to create an api client instance using information from the browser's current url