cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 19:08:18 -07:00
Code Issues Packages Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dashboard-ui/scripts/mediaplayer.js
View File

@ -47,7 +47,7 @@
function updateDeviceProfileForAndroid(profile) { function updateDeviceProfileForAndroid(profile) {
// Just here as an easy escape out, if ever needed // Just here as an easy escape out, if ever needed
var enableVlcVideo = true; var enableVlcVideo = window.VlcAudio;
var enableVlcAudio = true; var enableVlcAudio = true;
if (enableVlcVideo) { if (enableVlcVideo) {

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

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