mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
update video osd
This commit is contained in:
parent
1e3bc96dab
commit
9732babd25
16 changed files with 84 additions and 42 deletions
|
@ -14,12 +14,12 @@
|
||||||
},
|
},
|
||||||
"devDependencies": {},
|
"devDependencies": {},
|
||||||
"ignore": [],
|
"ignore": [],
|
||||||
"version": "1.4.447",
|
"version": "1.4.450",
|
||||||
"_release": "1.4.447",
|
"_release": "1.4.450",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "1.4.447",
|
"tag": "1.4.450",
|
||||||
"commit": "91e92ebbc11384f3d18e115f81dd0f359ad5190a"
|
"commit": "379047a56c13c7ad4136a86610af37060dc28912"
|
||||||
},
|
},
|
||||||
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
|
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
|
||||||
"_target": "^1.2.1",
|
"_target": "^1.2.1",
|
||||||
|
|
|
@ -250,6 +250,7 @@
|
||||||
|
|
||||||
if (userAgent.toLowerCase().indexOf("embytheaterpi") !== -1) {
|
if (userAgent.toLowerCase().indexOf("embytheaterpi") !== -1) {
|
||||||
browser.slow = true;
|
browser.slow = true;
|
||||||
|
browser.noAnimation = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isMobile(userAgent)) {
|
if (isMobile(userAgent)) {
|
||||||
|
|
|
@ -10,6 +10,10 @@
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (browser.noAnimation) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
return browser.supportsCssAnimation();
|
return browser.supportsCssAnimation();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
define([], function () {
|
define(['events', 'dom'], function (events, dom) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
function fullscreenManager() {
|
function fullscreenManager() {
|
||||||
|
@ -38,5 +38,23 @@ define([], function () {
|
||||||
return document.fullscreen || document.mozFullScreen || document.webkitIsFullScreen || document.msFullscreenElement ? true : false;
|
return document.fullscreen || document.mozFullScreen || document.webkitIsFullScreen || document.msFullscreenElement ? true : false;
|
||||||
};
|
};
|
||||||
|
|
||||||
return new fullscreenManager();
|
var manager = new fullscreenManager();
|
||||||
|
|
||||||
|
function onFullScreenChange() {
|
||||||
|
events.trigger(manager, 'fullscreenchange');
|
||||||
|
}
|
||||||
|
|
||||||
|
dom.addEventListener(document, 'fullscreenchange', onFullScreenChange, {
|
||||||
|
passive: true
|
||||||
|
});
|
||||||
|
|
||||||
|
dom.addEventListener(document, 'webkitfullscreenchange', onFullScreenChange, {
|
||||||
|
passive: true
|
||||||
|
});
|
||||||
|
|
||||||
|
dom.addEventListener(document, 'mozfullscreenchange', onFullScreenChange, {
|
||||||
|
passive: true
|
||||||
|
});
|
||||||
|
|
||||||
|
return manager;
|
||||||
});
|
});
|
|
@ -1145,7 +1145,7 @@ define(['browser', 'pluginManager', 'events', 'apphost', 'loading', 'playbackMan
|
||||||
|
|
||||||
function createMediaElement(options) {
|
function createMediaElement(options) {
|
||||||
|
|
||||||
if (browser.operaTv || browser.web0s || browser.ps4) {
|
if (browser.tv || browser.noAnimation) {
|
||||||
// too slow
|
// too slow
|
||||||
options.backdropUrl = null;
|
options.backdropUrl = null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,10 +73,6 @@ define(['inputManager', 'focusManager', 'browser', 'layoutManager', 'events', 'd
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (browser.ps4) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (browser.tv) {
|
if (browser.tv) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'globalize', 'connectionManager', 'loading', 'serverNotifications', 'apphost', 'fullscreenManager'], function (events, datetime, appSettings, pluginManager, userSettings, globalize, connectionManager, loading, serverNotifications, apphost, fullscreenManager) {
|
define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'globalize', 'connectionManager', 'loading', 'serverNotifications', 'apphost', 'fullscreenManager', 'layoutManager'], function (events, datetime, appSettings, pluginManager, userSettings, globalize, connectionManager, loading, serverNotifications, apphost, fullscreenManager, layoutManager) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
function enableLocalPlaylistManagement(player) {
|
function enableLocalPlaylistManagement(player) {
|
||||||
|
@ -11,6 +11,12 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function bindToFullscreenChange(player) {
|
||||||
|
events.on(fullscreenManager, 'fullscreenchange', function () {
|
||||||
|
events.trigger(player, 'fullscreenchange');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function PlaybackManager() {
|
function PlaybackManager() {
|
||||||
|
|
||||||
var self = this;
|
var self = this;
|
||||||
|
@ -198,7 +204,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
|
||||||
"SetRepeatMode"
|
"SetRepeatMode"
|
||||||
];
|
];
|
||||||
|
|
||||||
if (apphost.supports('fullscreenchange')) {
|
if (apphost.supports('fullscreenchange') && !layoutManager.tv) {
|
||||||
list.push('ToggleFullscreen');
|
list.push('ToggleFullscreen');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2551,6 +2557,10 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
|
||||||
if (enableLocalPlaylistManagement(player)) {
|
if (enableLocalPlaylistManagement(player)) {
|
||||||
events.on(player, 'error', onPlaybackError);
|
events.on(player, 'error', onPlaybackError);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (player.isLocalPlayer) {
|
||||||
|
bindToFullscreenChange(player);
|
||||||
|
}
|
||||||
bindStopped(player);
|
bindStopped(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -60,17 +60,26 @@
|
||||||
|
|
||||||
self.play = function (options) {
|
self.play = function (options) {
|
||||||
|
|
||||||
return sendPlayCommand(options, 'PlayNow');
|
var playOptions = {};
|
||||||
|
playOptions.ids = options.ids || options.items.map(function(i) {
|
||||||
|
return i.Id;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (options.startPositionTicks) {
|
||||||
|
playOptions.startPositionTicks = options.startPositionTicks;
|
||||||
|
}
|
||||||
|
|
||||||
|
return sendPlayCommand(playOptions, 'PlayNow');
|
||||||
};
|
};
|
||||||
|
|
||||||
self.shuffle = function (id) {
|
self.shuffle = function (item) {
|
||||||
|
|
||||||
sendPlayCommand({ ids: [id] }, 'PlayShuffle');
|
sendPlayCommand({ ids: [item.Id] }, 'PlayShuffle');
|
||||||
};
|
};
|
||||||
|
|
||||||
self.instantMix = function (id) {
|
self.instantMix = function (item) {
|
||||||
|
|
||||||
sendPlayCommand({ ids: [id] }, 'PlayInstantMix');
|
sendPlayCommand({ ids: [item.Id] }, 'PlayInstantMix');
|
||||||
};
|
};
|
||||||
|
|
||||||
self.queue = function (options) {
|
self.queue = function (options) {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'focusManager', 'apphost', 'loading', 'css!./style', 'material-icons', 'paper-icon-button-light'], function (dialogHelper, inputmanager, connectionManager, layoutManager, focusManager, appHost, loading) {
|
define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'focusManager', 'browser', 'apphost', 'loading', 'css!./style', 'material-icons', 'paper-icon-button-light'], function (dialogHelper, inputmanager, connectionManager, layoutManager, focusManager, browser, appHost, loading) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
function getImageUrl(item, options, apiClient) {
|
function getImageUrl(item, options, apiClient) {
|
||||||
|
@ -576,7 +576,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if (newCardImageContainer.animate) {
|
if (newCardImageContainer.animate && !browser.noAnimation) {
|
||||||
|
|
||||||
var keyframes = [
|
var keyframes = [
|
||||||
{ opacity: '0', offset: 0 },
|
{ opacity: '0', offset: 0 },
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "hls.js",
|
"name": "hls.js",
|
||||||
"version": "0.6.16",
|
"version": "0.6.17",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"description": "Media Source Extension - HLS library, by/for Dailymotion",
|
"description": "Media Source Extension - HLS library, by/for Dailymotion",
|
||||||
"homepage": "https://github.com/dailymotion/hls.js",
|
"homepage": "https://github.com/dailymotion/hls.js",
|
||||||
|
@ -16,11 +16,11 @@
|
||||||
"test",
|
"test",
|
||||||
"tests"
|
"tests"
|
||||||
],
|
],
|
||||||
"_release": "0.6.16",
|
"_release": "0.6.17",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "v0.6.16",
|
"tag": "v0.6.17",
|
||||||
"commit": "61fbeb069d8ee6e37933085d576cd65c057c1b28"
|
"commit": "51624f2b19db3d1e205188d541d0e379275eef2a"
|
||||||
},
|
},
|
||||||
"_source": "https://github.com/dailymotion/hls.js.git",
|
"_source": "https://github.com/dailymotion/hls.js.git",
|
||||||
"_target": "^0.6.11",
|
"_target": "^0.6.11",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "hls.js",
|
"name": "hls.js",
|
||||||
"version": "0.6.16",
|
"version": "0.6.17",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"description": "Media Source Extension - HLS library, by/for Dailymotion",
|
"description": "Media Source Extension - HLS library, by/for Dailymotion",
|
||||||
"homepage": "https://github.com/dailymotion/hls.js",
|
"homepage": "https://github.com/dailymotion/hls.js",
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "hls.js",
|
"name": "hls.js",
|
||||||
"version": "0.6.16",
|
"version": "0.6.17",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"description": "Media Source Extension - HLS library, by/for Dailymotion",
|
"description": "Media Source Extension - HLS library, by/for Dailymotion",
|
||||||
"homepage": "https://github.com/dailymotion/hls.js",
|
"homepage": "https://github.com/dailymotion/hls.js",
|
||||||
|
|
|
@ -324,16 +324,18 @@
|
||||||
|
|
||||||
var i, length;
|
var i, length;
|
||||||
|
|
||||||
if (isPaused) {
|
if (playPauseButtons) {
|
||||||
|
if (isPaused) {
|
||||||
for (i = 0, length = playPauseButtons.length; i < length; i++) {
|
|
||||||
playPauseButtons[i].querySelector('i').innerHTML = 'play_arrow';
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
for (i = 0, length = playPauseButtons.length; i < length; i++) {
|
||||||
|
playPauseButtons[i].querySelector('i').innerHTML = 'play_arrow';
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0, length = playPauseButtons.length; i < length; i++) {
|
} else {
|
||||||
playPauseButtons[i].querySelector('i').innerHTML = 'pause';
|
|
||||||
|
for (i = 0, length = playPauseButtons.length; i < length; i++) {
|
||||||
|
playPauseButtons[i].querySelector('i').innerHTML = 'pause';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1619,7 +1619,7 @@ var AppInfo = {};
|
||||||
define("confirm", [embyWebComponentsBowerPath + "/confirm/confirm"], returnFirstDependency);
|
define("confirm", [embyWebComponentsBowerPath + "/confirm/confirm"], returnFirstDependency);
|
||||||
}
|
}
|
||||||
|
|
||||||
var preferNativePrompt = preferNativeAlerts || browser.xboxOne || browser.ps4;
|
var preferNativePrompt = preferNativeAlerts || browser.xboxOne;
|
||||||
if (preferNativePrompt && window.confirm) {
|
if (preferNativePrompt && window.confirm) {
|
||||||
define("prompt", [embyWebComponentsBowerPath + "/prompt/nativeprompt"], returnFirstDependency);
|
define("prompt", [embyWebComponentsBowerPath + "/prompt/nativeprompt"], returnFirstDependency);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -531,6 +531,7 @@
|
||||||
events.on(player, 'pause', onPlayPauseStateChanged);
|
events.on(player, 'pause', onPlayPauseStateChanged);
|
||||||
events.on(player, 'playing', onPlayPauseStateChanged);
|
events.on(player, 'playing', onPlayPauseStateChanged);
|
||||||
events.on(player, 'timeupdate', onTimeUpdate);
|
events.on(player, 'timeupdate', onTimeUpdate);
|
||||||
|
events.on(player, 'fullscreenchange', updateFullscreenIcon);
|
||||||
}
|
}
|
||||||
|
|
||||||
function releaseCurrentPlayer() {
|
function releaseCurrentPlayer() {
|
||||||
|
@ -545,6 +546,7 @@
|
||||||
events.off(player, 'pause', onPlayPauseStateChanged);
|
events.off(player, 'pause', onPlayPauseStateChanged);
|
||||||
events.off(player, 'playing', onPlayPauseStateChanged);
|
events.off(player, 'playing', onPlayPauseStateChanged);
|
||||||
events.off(player, 'timeupdate', onTimeUpdate);
|
events.off(player, 'timeupdate', onTimeUpdate);
|
||||||
|
events.off(player, 'fullscreenchange', updateFullscreenIcon);
|
||||||
|
|
||||||
currentPlayer = null;
|
currentPlayer = null;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue