Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove touch controls from video player #2266

Merged
merged 3 commits into from
Feb 16, 2021
Merged

remove touch controls from video player #2266

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ca6cd8
remove touch controls from video player
dkanada Dec 26, 2020
e5503c8
add back target check
dkanada Dec 27, 2020
0e5ccfc
fix build error
dkanada Dec 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 4 additions & 73 deletions src/controllers/playback/video/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import itemHelper from '../../../components/itemHelper';
import mediaInfo from '../../../components/mediainfo/mediainfo';
import focusManager from '../../../components/focusManager';
import { Events } from 'jellyfin-apiclient';
import browser from '../../../scripts/browser';
import globalize from '../../../scripts/globalize';
import { appHost } from '../../../components/apphost';
import layoutManager from '../../../components/layoutManager';
Expand All @@ -30,52 +29,6 @@ import { appRouter } from '../../../components/appRouter';
}

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) {
if (item.Type === 'TvChannel') {
const apiClient = ServerConnections.getApiClient(item.ServerId);
Expand Down Expand Up @@ -676,7 +629,6 @@ import { appRouter } from '../../../components/appRouter';
updatePlayPauseState(playState.IsPaused);
const supportedCommands = playbackManager.getSupportedCommands(player);
currentPlayerSupportedCommands = supportedCommands;
supportsBrightnessChange = supportedCommands.indexOf('SetBrightness') !== -1;
updatePlayerVolumeState(player, playState.IsMuted, playState.VolumeLevel);

if (nowPlayingPositionSlider && !nowPlayingPositionSlider.dragging) {
Expand Down Expand Up @@ -1270,7 +1222,6 @@ import { appRouter } from '../../../components/appRouter';
let currentItem;
let recordingButtonManager;
let enableProgressByTimeOfDay;
let supportsBrightnessChange;
let currentVisibleMenu;
let statsOverlay;
let osdHideTimeout;
Expand Down Expand Up @@ -1466,15 +1417,10 @@ import { appRouter } from '../../../components/appRouter';
passive: true
});

if (browser.touch) {
dom.addEventListener(view, 'dblclick', onDoubleClick, {});
} else {
const options = { passive: true };
dom.addEventListener(view, 'dblclick', (e) => {
if (e.target !== view) return;
dkanada marked this conversation as resolved.
Show resolved Hide resolved
playbackManager.toggleFullscreen(currentPlayer);
}, options);
}
dom.addEventListener(view, 'dblclick', (e) => {
if (e.target !== view) return;
playbackManager.toggleFullscreen(currentPlayer);
dkanada marked this conversation as resolved.
Show resolved Hide resolved
});

view.querySelector('.buttonMute').addEventListener('click', function () {
playbackManager.toggleMute(currentPlayer);
Expand Down Expand Up @@ -1556,21 +1502,6 @@ import { appRouter } from '../../../components/appRouter';
view.querySelector('.btnAudio').addEventListener('click', showAudioTrackSelection);
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
const showIcon = (action) => {
let primary_icon_name = '';
Expand Down