mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge branch 'master' of https://github.com/jellyfin/jellyfin-web into replace-unicode
# Conflicts: # src/components/guide/guide.js # src/components/mediainfo/mediainfo.js # src/components/multiselect/multiselect.js # src/components/playback/brightnessosd.js # src/components/recordingcreator/recordingbutton.js # src/components/userdatabuttons/emby-ratingbutton.js # src/controllers/favorites.js
This commit is contained in:
grafixeyehero
commit
080b3365d6
145 changed files with 1438 additions and 4767 deletions
|
|
@ -467,34 +467,34 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
|
|||
|
||||
switch (e.detail.command) {
|
||||
case "left":
|
||||
if ("osd" === currentVisibleMenu) {
|
||||
showOsd();
|
||||
} else {
|
||||
if (!currentVisibleMenu) {
|
||||
e.preventDefault();
|
||||
playbackManager.rewind(player);
|
||||
if ("osd" === currentVisibleMenu) {
|
||||
showOsd();
|
||||
} else {
|
||||
if (!currentVisibleMenu) {
|
||||
e.preventDefault();
|
||||
playbackManager.rewind(player);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
break;
|
||||
|
||||
case "right":
|
||||
if ("osd" === currentVisibleMenu) {
|
||||
showOsd();
|
||||
} else if (!currentVisibleMenu) {
|
||||
e.preventDefault();
|
||||
playbackManager.fastForward(player);
|
||||
}
|
||||
if ("osd" === currentVisibleMenu) {
|
||||
showOsd();
|
||||
} else if (!currentVisibleMenu) {
|
||||
e.preventDefault();
|
||||
playbackManager.fastForward(player);
|
||||
}
|
||||
|
||||
break;
|
||||
break;
|
||||
|
||||
case "pageup":
|
||||
playbackManager.nextChapter(player);
|
||||
break;
|
||||
playbackManager.nextChapter(player);
|
||||
break;
|
||||
|
||||
case "pagedown":
|
||||
playbackManager.previousChapter(player);
|
||||
break;
|
||||
playbackManager.previousChapter(player);
|
||||
break;
|
||||
|
||||
case "up":
|
||||
case "down":
|
||||
|
|
@ -508,16 +508,16 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
|
|||
case "rewind":
|
||||
case "next":
|
||||
case "previous":
|
||||
showOsd();
|
||||
break;
|
||||
showOsd();
|
||||
break;
|
||||
|
||||
case "record":
|
||||
onRecordingCommand();
|
||||
showOsd();
|
||||
break;
|
||||
onRecordingCommand();
|
||||
showOsd();
|
||||
break;
|
||||
|
||||
case "togglestats":
|
||||
toggleStats();
|
||||
toggleStats();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -852,7 +852,6 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
|
|||
var volumeSlider = view.querySelector('.osdVolumeSliderContainer');
|
||||
var progressElement = volumeSlider.querySelector('.mdl-slider-background-lower');
|
||||
|
||||
|
||||
if (-1 === supportedCommands.indexOf("Mute")) {
|
||||
showMuteButton = false;
|
||||
}
|
||||
|
|
@ -1062,7 +1061,7 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
|
|||
var player = currentPlayer;
|
||||
if (subtitleSyncOverlay) {
|
||||
subtitleSyncOverlay.toggle(action);
|
||||
} else if(player){
|
||||
} else if (player) {
|
||||
subtitleSyncOverlay = new SubtitleSync(player);
|
||||
}
|
||||
});
|
||||
|
|
@ -1096,52 +1095,52 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
|
|||
case "k":
|
||||
playbackManager.playPause(currentPlayer);
|
||||
showOsd();
|
||||
break;
|
||||
break;
|
||||
|
||||
case "l":
|
||||
case "ArrowRight":
|
||||
case "Right":
|
||||
playbackManager.fastForward(currentPlayer);
|
||||
showOsd();
|
||||
break;
|
||||
break;
|
||||
|
||||
case "j":
|
||||
case "ArrowLeft":
|
||||
case "Left":
|
||||
playbackManager.rewind(currentPlayer);
|
||||
showOsd();
|
||||
break;
|
||||
break;
|
||||
|
||||
case "f":
|
||||
if (!e.ctrlKey && !e.metaKey) {
|
||||
playbackManager.toggleFullscreen(currentPlayer);
|
||||
showOsd();
|
||||
}
|
||||
break;
|
||||
if (!e.ctrlKey && !e.metaKey) {
|
||||
playbackManager.toggleFullscreen(currentPlayer);
|
||||
showOsd();
|
||||
}
|
||||
break;
|
||||
|
||||
case "m":
|
||||
playbackManager.toggleMute(currentPlayer);
|
||||
showOsd();
|
||||
break;
|
||||
playbackManager.toggleMute(currentPlayer);
|
||||
showOsd();
|
||||
break;
|
||||
|
||||
case "NavigationLeft":
|
||||
case "GamepadDPadLeft":
|
||||
case "GamepadLeftThumbstickLeft":
|
||||
// Ignores gamepad events that are always triggered, even when not focused.
|
||||
if (document.hasFocus()) {
|
||||
playbackManager.rewind(currentPlayer);
|
||||
showOsd();
|
||||
}
|
||||
break;
|
||||
if (document.hasFocus()) {
|
||||
playbackManager.rewind(currentPlayer);
|
||||
showOsd();
|
||||
}
|
||||
break;
|
||||
|
||||
case "NavigationRight":
|
||||
case "GamepadDPadRight":
|
||||
case "GamepadLeftThumbstickRight":
|
||||
// Ignores gamepad events that are always triggered, even when not focused.
|
||||
if (document.hasFocus()) {
|
||||
playbackManager.fastForward(currentPlayer);
|
||||
showOsd();
|
||||
}
|
||||
if (document.hasFocus()) {
|
||||
playbackManager.fastForward(currentPlayer);
|
||||
showOsd();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1275,7 +1274,7 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
|
|||
dom.addEventListener(window, "keydown", onWindowKeyDown, {
|
||||
passive: true
|
||||
});
|
||||
} catch(e) {
|
||||
} catch (e) {
|
||||
require(['appRouter'], function(appRouter) {
|
||||
appRouter.showDirect('/');
|
||||
});
|
||||
|
|
@ -1334,24 +1333,24 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
|
|||
|
||||
switch (pointerType) {
|
||||
case "touch":
|
||||
if (now - lastPointerDown > 300) {
|
||||
lastPointerDown = now;
|
||||
toggleOsd();
|
||||
}
|
||||
if (now - lastPointerDown > 300) {
|
||||
lastPointerDown = now;
|
||||
toggleOsd();
|
||||
}
|
||||
|
||||
break;
|
||||
break;
|
||||
|
||||
case "mouse":
|
||||
if (!e.button) {
|
||||
playbackManager.playPause(currentPlayer);
|
||||
showOsd();
|
||||
}
|
||||
if (!e.button) {
|
||||
playbackManager.playPause(currentPlayer);
|
||||
showOsd();
|
||||
}
|
||||
|
||||
break;
|
||||
break;
|
||||
|
||||
default:
|
||||
playbackManager.playPause(currentPlayer);
|
||||
showOsd();
|
||||
playbackManager.playPause(currentPlayer);
|
||||
showOsd();
|
||||
}
|
||||
}, {
|
||||
passive: true
|
||||
|
|
@ -1361,14 +1360,16 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
|
|||
dom.addEventListener(view, "dblclick", onDoubleClick, {});
|
||||
} else {
|
||||
var options = { passive: true };
|
||||
dom.addEventListener(view, "dblclick", function () { playbackManager.toggleFullscreen(currentPlayer); }, options);
|
||||
dom.addEventListener(view, "dblclick", function () {
|
||||
playbackManager.toggleFullscreen(currentPlayer);
|
||||
}, options);
|
||||
}
|
||||
|
||||
view.querySelector(".buttonMute").addEventListener("click", function () {
|
||||
playbackManager.toggleMute(currentPlayer);
|
||||
});
|
||||
nowPlayingVolumeSlider.addEventListener("change", function () {
|
||||
if(volumeSliderTimer){
|
||||
if (volumeSliderTimer) {
|
||||
// interupt and remove existing timer
|
||||
clearTimeout(volumeSliderTimer);
|
||||
volumeSliderTimer = null;
|
||||
|
|
@ -1376,10 +1377,10 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
|
|||
playbackManager.setVolume(this.value, currentPlayer);
|
||||
});
|
||||
nowPlayingVolumeSlider.addEventListener("mousemove", function () {
|
||||
if(!volumeSliderTimer){
|
||||
if (!volumeSliderTimer) {
|
||||
var that = this;
|
||||
// register new timer
|
||||
volumeSliderTimer = setTimeout(function(){
|
||||
volumeSliderTimer = setTimeout(function() {
|
||||
playbackManager.setVolume(that.value, currentPlayer);
|
||||
// delete timer after completion
|
||||
volumeSliderTimer = null;
|
||||
|
|
@ -1387,10 +1388,10 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
|
|||
}
|
||||
});
|
||||
nowPlayingVolumeSlider.addEventListener("touchmove", function () {
|
||||
if(!volumeSliderTimer){
|
||||
if (!volumeSliderTimer) {
|
||||
var that = this;
|
||||
// register new timer
|
||||
volumeSliderTimer = setTimeout(function(){
|
||||
volumeSliderTimer = setTimeout(function() {
|
||||
playbackManager.setVolume(that.value, currentPlayer);
|
||||
// delete timer after completion
|
||||
volumeSliderTimer = null;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue