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.

8 files changed, 8 insertions, 8 deletions

diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js
index 06ab09892..0f821d4fc 100644
--- a/src/components/auth/SetupAssistant.js
+++ b/src/components/auth/SetupAssistant.js
@@ -37,7 +37,7 @@ const messages = defineMessages({
 
 let transition = 'none';
 
-if (window.matchMedia('(prefers-reduced-motion: no-preference)')) {
+if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) {
   transition = 'all 0.25s';
 }
 
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index de962cc12..d5e1deb39 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -47,7 +47,7 @@ const messages = defineMessages({
 
 let transition = 'none';
 
-if (window.matchMedia('(prefers-reduced-motion: no-preference)')) {
+if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) {
   transition = 'transform 0.5s ease';
 }
 
diff --git a/src/components/services/content/ConnectionLostBanner.js b/src/components/services/content/ConnectionLostBanner.js
index 343ddf8b4..ebe863333 100644
--- a/src/components/services/content/ConnectionLostBanner.js
+++ b/src/components/services/content/ConnectionLostBanner.js
@@ -26,7 +26,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/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index 023e152c7..d4a4048eb 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -72,7 +72,7 @@ let pollIndicatorTransition = 'none';
 let polledTransition = 'none';
 let pollAnsweredTransition = 'none';
 
-if (window.matchMedia('(prefers-reduced-motion: no-preference)')) {
+if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) {
   pollIndicatorTransition = 'background 0.5s';
   polledTransition = 'background 0.1s';
   pollAnsweredTransition = 'background 0.1s';
diff --git a/src/components/ui/AppLoader/styles.js b/src/components/ui/AppLoader/styles.js
index 011f6282d..9891e0387 100644
--- a/src/components/ui/AppLoader/styles.js
+++ b/src/components/ui/AppLoader/styles.js
@@ -1,6 +1,6 @@
 let sloganTransition = 'none';
 
-if (window.matchMedia('(prefers-reduced-motion: no-preference)')) {
+if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) {
   sloganTransition = 'opacity 1s ease';
 }
 
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';
 }