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

remove touch controls from video player

Browse source
This commit is contained in:
dkanada 2020-12-26 14:32:56 +09:00
parent 3db21675b7
commit 2ca6cd869c
1 changed files with 3 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

76
src/controllers/playback/video/index.js
View file

@ -8,7 +8,6 @@ import itemHelper from '../../../components/itemHelper';
import mediaInfo from '../../../components/mediainfo/mediainfo'; import mediaInfo from '../../../components/mediainfo/mediainfo';
import focusManager from '../../../components/focusManager'; import focusManager from '../../../components/focusManager';
import { Events } from 'jellyfin-apiclient'; import { Events } from 'jellyfin-apiclient';
import browser from '../../../scripts/browser';
import globalize from '../../../scripts/globalize'; import globalize from '../../../scripts/globalize';
import { appHost } from '../../../components/apphost'; import { appHost } from '../../../components/apphost';
import layoutManager from '../../../components/layoutManager'; import layoutManager from '../../../components/layoutManager';
@ -30,52 +29,6 @@ import { appRouter } from '../../../components/appRouter';
} }
export default function (view, params) { export default function (view, params) {
function onVerticalSwipe(e, elem, data) {
const player = currentPlayer;
if (player) {
const deltaY = data.currentDeltaY;
const windowSize = dom.getWindowSize();
if (supportsBrightnessChange && data.clientX < windowSize.innerWidth / 2) {
return void doBrightnessTouch(deltaY, player, windowSize.innerHeight);
}
doVolumeTouch(deltaY, player, windowSize.innerHeight);
}
}
function doBrightnessTouch(deltaY, player, viewHeight) {
const delta = -deltaY / viewHeight * 100;
let newValue = playbackManager.getBrightness(player) + delta;
newValue = Math.min(newValue, 100);
newValue = Math.max(newValue, 0);
playbackManager.setBrightness(newValue, player);
}
function doVolumeTouch(deltaY, player, viewHeight) {
const delta = -deltaY / viewHeight * 100;
let newValue = playbackManager.getVolume(player) + delta;
newValue = Math.min(newValue, 100);
newValue = Math.max(newValue, 0);
playbackManager.setVolume(newValue, player);
}
function onDoubleClick(e) {
const clientX = e.clientX;
if (clientX != null) {
if (clientX < dom.getWindowSize().innerWidth / 2) {
playbackManager.rewind(currentPlayer);
} else {
playbackManager.fastForward(currentPlayer);
}
e.preventDefault();
e.stopPropagation();
}
}
function getDisplayItem(item) { function getDisplayItem(item) {
if (item.Type === 'TvChannel') { if (item.Type === 'TvChannel') {
const apiClient = ServerConnections.getApiClient(item.ServerId); const apiClient = ServerConnections.getApiClient(item.ServerId);
@ -676,7 +629,6 @@ import { appRouter } from '../../../components/appRouter';
updatePlayPauseState(playState.IsPaused); updatePlayPauseState(playState.IsPaused);
const supportedCommands = playbackManager.getSupportedCommands(player); const supportedCommands = playbackManager.getSupportedCommands(player);
currentPlayerSupportedCommands = supportedCommands; currentPlayerSupportedCommands = supportedCommands;
supportsBrightnessChange = supportedCommands.indexOf('SetBrightness') !== -1;
updatePlayerVolumeState(player, playState.IsMuted, playState.VolumeLevel); updatePlayerVolumeState(player, playState.IsMuted, playState.VolumeLevel);
if (nowPlayingPositionSlider && !nowPlayingPositionSlider.dragging) { if (nowPlayingPositionSlider && !nowPlayingPositionSlider.dragging) {
@ -1270,7 +1222,6 @@ import { appRouter } from '../../../components/appRouter';
let currentItem; let currentItem;
let recordingButtonManager; let recordingButtonManager;
let enableProgressByTimeOfDay; let enableProgressByTimeOfDay;
let supportsBrightnessChange;
let currentVisibleMenu; let currentVisibleMenu;
let statsOverlay; let statsOverlay;
let osdHideTimeout; let osdHideTimeout;
@ -1466,15 +1417,9 @@ import { appRouter } from '../../../components/appRouter';
passive: true passive: true
}); });
if (browser.touch) { dom.addEventListener(view, 'dblclick', function () {
dom.addEventListener(view, 'dblclick', onDoubleClick, {}); playbackManager.toggleFullscreen(currentPlayer);
} else { });
const options = { passive: true };
dom.addEventListener(view, 'dblclick', (e) => {
if (e.target !== view) return;
playbackManager.toggleFullscreen(currentPlayer);
}, options);
}
view.querySelector('.buttonMute').addEventListener('click', function () { view.querySelector('.buttonMute').addEventListener('click', function () {
playbackManager.toggleMute(currentPlayer); playbackManager.toggleMute(currentPlayer);
@ -1556,21 +1501,6 @@ import { appRouter } from '../../../components/appRouter';
view.querySelector('.btnAudio').addEventListener('click', showAudioTrackSelection); view.querySelector('.btnAudio').addEventListener('click', showAudioTrackSelection);
view.querySelector('.btnSubtitles').addEventListener('click', showSubtitleTrackSelection); view.querySelector('.btnSubtitles').addEventListener('click', showSubtitleTrackSelection);
if (browser.touch) {
(function () {
import('../../../scripts/touchHelper').then(({default: TouchHelper}) => {
self.touchHelper = new TouchHelper(view, {
swipeYThreshold: 30,
triggerOnMove: true,
preventDefaultOnMove: true,
ignoreTagNames: ['BUTTON', 'INPUT', 'TEXTAREA']
});
Events.on(self.touchHelper, 'swipeup', onVerticalSwipe);
Events.on(self.touchHelper, 'swipedown', onVerticalSwipe);
});
})();
}
// Register to SyncPlay playback events and show big animated icon // Register to SyncPlay playback events and show big animated icon
const showIcon = (action) => { const showIcon = (action) => {
let primary_icon_name = ''; let primary_icon_name = '';