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

unify video osd

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-03 01:51:36 -05:00
parent b3a664583a
commit 407f137095
24 changed files with 713 additions and 6466 deletions
Download patch file Download diff file Expand all files Collapse all files

18
dashboard-ui/scripts/itemdetailpage.js
View file

@ -1,4 +1,4 @@
define(['layoutManager', 'cardBuilder', 'datetime', 'mediaInfo', 'backdrop', 'listView', 'itemContextMenu', 'itemHelper', 'userdataButtons', 'dom', 'indicators', 'apphost', 'imageLoader', 'libraryMenu', 'shell', 'globalize', 'browser', 'events', 'scrollHelper', 'scrollStyles', 'emby-itemscontainer', 'emby-checkbox'], function (layoutManager, cardBuilder, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, userdataButtons, dom, indicators, appHost, imageLoader, libraryMenu, shell, globalize, browser, events, scrollHelper) {
define(['layoutManager', 'cardBuilder', 'datetime', 'mediaInfo', 'backdrop', 'listView', 'itemContextMenu', 'itemHelper', 'userdataButtons', 'dom', 'indicators', 'apphost', 'imageLoader', 'libraryMenu', 'globalize', 'browser', 'events', 'scrollHelper', 'playbackManager', 'scrollStyles', 'emby-itemscontainer', 'emby-checkbox'], function (layoutManager, cardBuilder, datetime, mediaInfo, backdrop, listView, itemContextMenu, itemHelper, userdataButtons, dom, indicators, appHost, imageLoader, libraryMenu, globalize, browser, events, scrollHelper, playbackManager) {
'use strict';
function getPromise(params) {
@ -229,7 +229,7 @@
hideAll(page, 'btnPlay');
}
}
else if (MediaController.canPlay(item)) {
else if (playbackManager.canPlay(item)) {
hideAll(page, 'btnPlay', true);
canPlay = true;
}
@ -2146,7 +2146,7 @@
function play(startPosition) {
MediaController.play({
playbackManager.play({
items: [currentItem],
startPositionTicks: startPosition
});
@ -2176,17 +2176,7 @@
function playTrailer(page) {
if (!currentItem.LocalTrailerCount) {
shell.openUrl(currentItem.RemoteTrailers[0].Url);
return;
}
ApiClient.getLocalTrailers(Dashboard.getCurrentUserId(), currentItem.Id).then(function (trailers) {
MediaController.play({ items: trailers });
});
playbackManager.playTrailers(currentItem);
}
function showPlayMenu(item, target) {