Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix pop-out player appearing on mobile screens in web UI (#15157)

Browse source 
Fix #15092
This commit is contained in:
Eugen Rochko 2020-11-16 05:16:39 +01:00 • committed by GitHub
parent 04a079e723
commit 18ca4e0e9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 79 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/javascript/mastodon/is_mobile.js
View file

@ -1,9 +1,18 @@
import { supportsPassiveEvents } from 'detect-passive-events';
import { forceSingleColumn } from 'mastodon/initial_state';
const LAYOUT_BREAKPOINT = 630;
export function isMobile(width) {
return width <= LAYOUT_BREAKPOINT;
export const isMobile = width => width <= LAYOUT_BREAKPOINT;
export const layoutFromWindow = () => {
if (isMobile(window.innerWidth)) {
return 'mobile';
} else if (forceSingleColumn) {
return 'single-column';
} else {
return 'multi-column';
}
};
const iOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
@ -11,17 +20,13 @@ const iOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
let userTouching = false;
let listenerOptions = supportsPassiveEvents ? { passive: true } : false;
function touchListener() {
const touchListener = () => {
userTouching = true;
window.removeEventListener('touchstart', touchListener, listenerOptions);
}
};
window.addEventListener('touchstart', touchListener, listenerOptions);
export function isUserTouching() {
return userTouching;
}
export const isUserTouching = () => userTouching;
export function isIOS() {
return iOS;
};
export const isIOS = () => iOS;