From d0773cec4a8ca489f1fb721d4e8d21406a7b7319 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Mon, 23 Nov 2020 13:47:36 -0500 Subject: [PATCH] only use custom scrollbar on non-mac --- static/app-strings.json | 1 + ui/component/app/view.jsx | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/static/app-strings.json b/static/app-strings.json index a68c3aeff..4d5c3fa3f 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -1489,5 +1489,6 @@ "Learn more about LBRY Credits on %DOMAIN%": "Learn more about LBRY Credits on %DOMAIN%", "Results boosted by %lbc%": "Results boosted by %lbc%", "This will be visible in a few minutes.": "This will be visible in a few minutes.", + "Trending for #Agnostic": "Trending for #Agnostic", "--end--": "--end--" } diff --git a/ui/component/app/view.jsx b/ui/component/app/view.jsx index afd0407f7..cda962274 100644 --- a/ui/component/app/view.jsx +++ b/ui/component/app/view.jsx @@ -37,9 +37,7 @@ import { } from 'web/effects/use-degraded-performance'; // @endif export const MAIN_WRAPPER_CLASS = 'main-wrapper'; -// @if TARGET='app' -export const IS_MAC = process.platform === 'darwin'; -// @endif +export const IS_MAC = navigator.userAgent.indexOf('Mac OS X') !== -1; // button numbers pulled from https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/button const MOUSE_BACK_BTN = 3; @@ -135,11 +133,7 @@ function App(props: Props) { const sanitizedReferrerParam = rawReferrerParam && rawReferrerParam.replace(':', '#'); const shouldHideNag = pathname.startsWith(`/$/${PAGES.EMBED}`) || pathname.startsWith(`/$/${PAGES.AUTH_VERIFY}`); const userId = user && user.id; - - let useCustomScrollbar = true; - // @if TARGET='app' - useCustomScrollbar = !IS_MAC; - // @endif + const useCustomScrollbar = !IS_MAC; let uri; try {