From 11c2b649388687570851fcb58ab59f5daaa3f194 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Wed, 11 Aug 2021 18:50:42 +0530 Subject: revert: fixing #1757 by commenting out partial fix - Fixes issue with ferdi not starting up. - Also adds some defensive checks for the same code in other repeated locations. --- src/features/webControls/components/WebControls.js | 2 +- src/features/workspaces/components/WorkspaceDrawerItem.js | 2 +- src/features/workspaces/components/WorkspaceSwitchingIndicator.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/features') diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js index 417ebb0b0..9a95eb2d2 100644 --- a/src/features/webControls/components/WebControls.js +++ b/src/features/webControls/components/WebControls.js @@ -38,7 +38,7 @@ const messages = defineMessages({ let buttonTransition = 'none'; -if (window.matchMedia('(prefers-reduced-motion: no-preference)')) { +if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) { buttonTransition = 'opacity 0.25s'; } diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.js b/src/features/workspaces/components/WorkspaceDrawerItem.js index c3f9fcb19..f08e87bd7 100644 --- a/src/features/workspaces/components/WorkspaceDrawerItem.js +++ b/src/features/workspaces/components/WorkspaceDrawerItem.js @@ -20,7 +20,7 @@ const messages = defineMessages({ let itemTransition = 'none'; -if (window.matchMedia('(prefers-reduced-motion: no-preference)')) { +if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) { itemTransition = 'background-color 300ms ease-out'; } diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js index 613075c4a..c8ec0bc4c 100644 --- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js +++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js @@ -17,7 +17,7 @@ const messages = defineMessages({ let wrapperTransition = 'none'; -if (window.matchMedia('(prefers-reduced-motion: no-preference)')) { +if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) { wrapperTransition = 'width 0.5s ease'; } -- cgit v1.2.3-70-g09d2