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 android init

Browse source
This commit is contained in:
Luke Pulverenti 2016-02-05 12:04:38 -05:00
parent 69daa8a476
commit 9a643e6058
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1812,7 +1812,7 @@ var AppInfo = {};
}
function getBowerPath() {
var bowerPath = "bower_components";
// Put the version into the bower path since we can't easily put a query string param on html imports
@ -2040,7 +2040,7 @@ var AppInfo = {};
}
function initRequireWithBrowser(browser) {
var bowerPath = getBowerPath();
var embyWebComponentsBowerPath = bowerPath + '/emby-webcomponents';
@ -2368,11 +2368,14 @@ var AppInfo = {};
// Remove special characters
var cleanDeviceName = device.model.replace(/[^\w\s]/gi, '');
var deviceId = window.MainActivity ? MainActivity.getLegacyDeviceId() : null;
deviceId = deviceId || device.uuid;
var deviceId = null;
if (window.MainActivity) {
deviceId = MainActivity.getLegacyDeviceId();
}
resolve({
deviceId: deviceId,
deviceId: deviceId || device.uuid,
deviceName: cleanDeviceName,
appName: name,
appVersion: appVersion