aboutsummaryrefslogtreecommitdiffstats
path: root/src/features/workspaces
diff options
context:
space:
mode:
authorLibravatar Vijay A <avijayr@protonmail.com>2021-08-11 18:50:42 +0530
committerLibravatar Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com>2021-08-11 13:38:04 +0000
commit11c2b649388687570851fcb58ab59f5daaa3f194 (patch)
tree257acfbcc42e542978b67a1e4edccc87ca0be4a6 /src/features/workspaces
parent5.6.1-nightly.22 [skip ci] (diff)
downloadferdium-app-11c2b649388687570851fcb58ab59f5daaa3f194.tar.gz
ferdium-app-11c2b649388687570851fcb58ab59f5daaa3f194.tar.zst
ferdium-app-11c2b649388687570851fcb58ab59f5daaa3f194.zip
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.
Diffstat (limited to 'src/features/workspaces')
-rw-r--r--src/features/workspaces/components/WorkspaceDrawerItem.js2
-rw-r--r--src/features/workspaces/components/WorkspaceSwitchingIndicator.js2
2 files changed, 2 insertions, 2 deletions
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({
20 20
21let itemTransition = 'none'; 21let itemTransition = 'none';
22 22
23if (window.matchMedia('(prefers-reduced-motion: no-preference)')) { 23if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) {
24 itemTransition = 'background-color 300ms ease-out'; 24 itemTransition = 'background-color 300ms ease-out';
25} 25}
26 26
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({
17 17
18let wrapperTransition = 'none'; 18let wrapperTransition = 'none';
19 19
20if (window.matchMedia('(prefers-reduced-motion: no-preference)')) { 20if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) {
21 wrapperTransition = 'width 0.5s ease'; 21 wrapperTransition = 'width 0.5s ease';
22} 22}
23 23