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

Merge branch 'master' into synchronize-subtitles

Browse source
This commit is contained in:
redSpoutnik 2019-04-30 20:58:51 +02:00 • committed by GitHub
commit 4d8ec5b466
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
105 changed files with 2914 additions and 870 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/controllers/videoosd.js
View file

@ -370,7 +370,7 @@ define(["playbackManager", "dom", "inputmanager", "datetime", "itemHelper", "med
if ("osd" === currentVisibleMenu) {
hideOsd();
} else if (!currentVisibleMenu) {
showOsd();
showOsd();
}
}
@ -1207,7 +1207,6 @@ define(["playbackManager", "dom", "inputmanager", "datetime", "itemHelper", "med
dom.addEventListener(document, window.PointerEvent ? "pointermove" : "mousemove", onPointerMove, {
passive: true
});
document.body.classList.add("autoScrollY");
showOsd();
inputManager.on(window, onInputCommand);
dom.addEventListener(window, "keydown", onWindowKeyDown, {
@ -1228,7 +1227,6 @@ define(["playbackManager", "dom", "inputmanager", "datetime", "itemHelper", "med
dom.removeEventListener(document, window.PointerEvent ? "pointermove" : "mousemove", onPointerMove, {
passive: true
});
document.body.classList.remove("autoScrollY");
inputManager.off(window, onInputCommand);
events.off(playbackManager, "playerchange", onPlayerChange);
releaseCurrentPlayer();
@ -1293,6 +1291,9 @@ define(["playbackManager", "dom", "inputmanager", "datetime", "itemHelper", "med
if (browser.touch) {
dom.addEventListener(view, "dblclick", onDoubleClick, {});
} else {
var options = { passive: true };
dom.addEventListener(view, "dblclick", function () { playbackManager.toggleFullscreen(currentPlayer); }, options);
}
view.querySelector(".buttonMute").addEventListener("click", function () {