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

add mobile app connection manager fixes

Browse source
This commit is contained in:
Luke Pulverenti 2015-05-02 19:00:19 -04:00
parent e2ebee7c31
commit 7c34d228e6
3 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/nowplaying.html
View file

@ -16,7 +16,7 @@
<div data-role="content" style="padding: 1em 0;"> <div data-role="content" style="padding: 1em 0;">
<div style="text-align: center;"> <div style="text-align: center;">
<div class="tabNowPlaying tabContent"> <div class="tabNowPlaying tabContent" style="display:none;">
<div class="itemName" style="line-height: normal;"></div> <div class="itemName" style="line-height: normal;"></div>
<div class="nowPlayingPageImage" style="margin: 1em 0;"></div> <div class="nowPlayingPageImage" style="margin: 1em 0;"></div>
<div> <div>

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

@ -1377,20 +1377,34 @@ var Dashboard = {
} }
var appVersion = window.dashboardVersion; var appVersion = window.dashboardVersion;
var appName = "Emby Mobile"; var appName = Dashboard.isConnectMode() ?
"Emby Mobile" :
"Emby Web Client";
var deviceName; var deviceName;
var deviceId; var deviceId;
// Cordova // Cordova
if (window.device) { //if (window.device) {
deviceName = device.model; // deviceName = device.model;
deviceId = device.uuid; // deviceId = device.uuid;
} else { //}
//else
{
deviceName = generateDeviceName(); deviceName = generateDeviceName();
deviceId = MediaBrowser.generateDeviceId();
var seed = [];
var keyName = 'randomId';
if (Dashboard.isRunningInCordova()) {
seed.push('cordova');
keyName = 'cordovaDeviceId';
}
deviceId = MediaBrowser.generateDeviceId(keyName, seed.join(','));
} }
return { return {
@ -1445,6 +1459,7 @@ var Dashboard = {
initializeApiClient(ApiClient); initializeApiClient(ApiClient);
ConnectionManager.addApiClient(ApiClient, true).fail(Dashboard.logout); ConnectionManager.addApiClient(ApiClient, true).fail(Dashboard.logout);
} else { } else {
Dashboard.logout(); Dashboard.logout();
@ -1464,9 +1479,9 @@ var Dashboard = {
} }
if (window.ApiClient) { if (window.ApiClient) {
Dashboard.importCss(ApiClient.getUrl('Branding/Css'));
ApiClient.getDefaultImageQuality = Dashboard.getDefaultImageQuality; ApiClient.getDefaultImageQuality = Dashboard.getDefaultImageQuality;
Dashboard.importCss(ApiClient.getUrl('Branding/Css'));
} }
} }

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

@ -4,23 +4,26 @@
globalScope.MediaBrowser = {}; globalScope.MediaBrowser = {};
} }
globalScope.MediaBrowser.generateDeviceId = function () { globalScope.MediaBrowser.generateDeviceId = function (keyName, seed) {
var keys = []; var keys = [];
keys.push(navigator.userAgent); keys.push(navigator.userAgent);
keys.push((navigator.cpuClass || "")); keys.push((navigator.cpuClass || ""));
if (seed) {
keys.push(seed);
}
var randomId = ''; var randomId = '';
// Since the above is not guaranteed to be unique per device, add a little more // Since the above is not guaranteed to be unique per device, add a little more
randomId = store.getItem('randomId'); randomId = store.getItem(keyName);
if (!randomId) { if (!randomId) {
randomId = new Date().getTime(); randomId = new Date().getTime();
store.setItem('randomId', randomId.toString()); store.setItem(keyName, randomId.toString());
} }
keys.push(randomId); keys.push(randomId);