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 now playing screen

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-20 12:52:37 -05:00
parent 668418e69b
commit 4589e01159
22 changed files with 245 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dashboard-ui/scripts/livetvitems.js
View file

@ -120,13 +120,6 @@
query.ParentId = LibraryMenu.getTopParentId();
var page = this;
var limit = LibraryBrowser.getDefaultPageSize();
// If the default page size has changed, the start index will have to be reset
if (limit != query.Limit) {
query.Limit = limit;
query.StartIndex = 0;
}
if (params.IsMovie == 'true') {
query.IsMovie = true;

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

@ -1570,7 +1570,10 @@ var AppInfo = {};
document.title = Globalize.translateDocument(document.title, 'core');
loadPlugins([], browserInfo).then(onAppReady);
require(['apphost'], function (appHost) {
loadPlugins([], appHost, browserInfo).then(onAppReady);
});
}
function defineRoute(newRoute, dictionary) {
@ -2368,7 +2371,7 @@ var AppInfo = {};
});
}
function loadPlugins(externalPlugins, browser, shell) {
function loadPlugins(externalPlugins, appHost, browser, shell) {
console.log('Loading installed plugins');
@ -2413,10 +2416,13 @@ var AppInfo = {};
}
list.push('bower_components/emby-webcomponents/htmlvideoplayer/plugin');
list.push('bower_components/emby-webcomponents/sessionplayer');
if (browser.chrome) {
list.push('bower_components/emby-webcomponents/chromecastplayer');
if (appHost.supports('remotecontrol')) {
list.push('bower_components/emby-webcomponents/sessionplayer');
if (browser.chrome) {
list.push('bower_components/emby-webcomponents/chromecastplayer');
}
}
list.push('bower_components/emby-webcomponents/youtubeplayer/plugin');

4
dashboard-ui/scripts/videoosd.js
View file

@ -1,4 +1,4 @@
define(['playbackManager', 'dom', 'inputmanager', 'datetime', 'itemHelper', 'mediaInfo', 'focusManager', 'imageLoader', 'scrollHelper', 'events', 'connectionManager', 'browser', 'globalize', 'apphost', 'scrollStyles', 'emby-slider'], function (playbackManager, dom, inputManager, datetime, itemHelper, mediaInfo, focusManager, imageLoader, scrollHelper, events, connectionManager, browser, globalize, appHost) {
define(['playbackManager', 'dom', 'inputmanager', 'datetime', 'itemHelper', 'mediaInfo', 'focusManager', 'imageLoader', 'scrollHelper', 'events', 'connectionManager', 'browser', 'globalize', 'apphost', 'layoutManager', 'scrollStyles', 'emby-slider'], function (playbackManager, dom, inputManager, datetime, itemHelper, mediaInfo, focusManager, imageLoader, scrollHelper, events, connectionManager, browser, globalize, appHost, layoutManager) {
'use strict';
function seriesImageUrl(item, options) {
@ -425,7 +425,7 @@
releaseCurrentPlayer();
});
if (appHost.supports('remotecontrol')) {
if (appHost.supports('remotecontrol') && !layoutManager.tv) {
view.querySelector('.btnCast').classList.remove('hide');
}