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

Fix suggestions and rebase issues

Browse source
This commit is contained in:
MrTimscampi 2020-08-09 15:03:41 +02:00
parent 37abd530eb
commit 0643e29404
10 changed files with 33 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/appRouter.js
View file

@ -1,6 +1,7 @@
define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdrop', 'browser', 'page', 'appSettings', 'apphost', 'connectionManager'], function (loading, globalize, events, viewManager, skinManager, backdrop, browser, page, appSettings, appHost, connectionManager) {
'use strict';
appHost = appHost.default || appHost;
viewManager = viewManager.default || viewManager;
browser = browser.default || browser;
loading = loading.default || loading;
@ -330,8 +331,8 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
}
if (shouldExitApp) {
if (appHost.default.supports('exit')) {
appHost.default.exit();
if (appHost.supports('exit')) {
appHost.exit();
return;
}
return;

17
src/components/apphost.js
View file

@ -113,14 +113,6 @@ function getDeviceName() {
deviceName += ' Android';
}
if (browser.ipad) {
deviceName += ' iPad';
} else if (browser.iphone) {
deviceName += ' iPhone';
} else if (browser.android) {
deviceName += ' Android';
}
return deviceName;
}
@ -326,7 +318,7 @@ function askForExit() {
let deviceId;
let deviceName;
const appName = 'Jellyfin Web';
const appVersion = '10.6.0';
const appVersion = '10.7.0';
const appHost = {
getWindowState: function () {
@ -383,13 +375,6 @@ const appHost = {
getPushTokenInfo: function () {
return {};
},
setThemeColor: function (color) {
const metaThemeColor = document.querySelector('meta[name=theme-color]');
if (metaThemeColor) {
metaThemeColor.setAttribute('content', color);
}
},
setUserScalable: function (scalable) {
if (!browser.tv) {
const att = scalable ? 'width=device-width, initial-scale=1, minimum-scale=1, user-scalable=yes' : 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no';

2
src/components/multiSelect/multiSelect.js
View file

@ -196,7 +196,7 @@ import 'css!./multiSelect';
});
}
if (user.Policy.EnableContentDownloading && appHost.default.supports('filedownload')) {
if (user.Policy.EnableContentDownloading && appHost.supports('filedownload')) {
menuItems.push({
name: globalize.translate('ButtonDownload'),
id: 'download',

1
src/components/qualityOptions.js
View file

@ -12,7 +12,6 @@ export function getVideoQualityOptions(options) {
}
var maxAllowedWidth = videoWidth || 4096;
//var maxAllowedHeight = videoHeight || 2304;
var qualityOptions = [];

3
src/components/remotecontrol/remotecontrol.js
View file

@ -1,6 +1,7 @@
define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageLoader', 'playbackManager', 'nowPlayingHelper', 'events', 'connectionManager', 'apphost', 'globalize', 'layoutManager', 'userSettings', 'cardBuilder', 'itemContextMenu', 'cardStyle', 'emby-itemscontainer', 'css!./remotecontrol.css', 'emby-ratingbutton'], function (browser, datetime, backdrop, libraryBrowser, listView, imageLoader, playbackManager, nowPlayingHelper, events, connectionManager, appHost, globalize, layoutManager, userSettings, cardBuilder, itemContextMenu) {
'use strict';
appHost = appHost.default || appHost;
playbackManager = playbackManager.default || playbackManager;
layoutManager = layoutManager.default || layoutManager;
@ -398,7 +399,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
showVolumeSlider = false;
}
if (currentPlayer.isLocalPlayer && appHost.default.supports('physicalvolumecontrol')) {
if (currentPlayer.isLocalPlayer && appHost.supports('physicalvolumecontrol')) {
showMuteButton = false;
showVolumeSlider = false;
}