diff options
author | Vijay A <avijayr@protonmail.com> | 2021-08-11 18:50:42 +0530 |
---|---|---|
committer | Vijay Raghavan Aravamudhan <vraravam@users.noreply.github.com> | 2021-08-11 13:38:04 +0000 |
commit | 11c2b649388687570851fcb58ab59f5daaa3f194 (patch) | |
tree | 257acfbcc42e542978b67a1e4edccc87ca0be4a6 /src/components | |
parent | 5.6.1-nightly.22 [skip ci] (diff) | |
download | ferdium-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/components')
-rw-r--r-- | src/components/auth/SetupAssistant.js | 2 | ||||
-rw-r--r-- | src/components/layout/AppLayout.js | 2 | ||||
-rw-r--r-- | src/components/services/content/ConnectionLostBanner.js | 2 | ||||
-rw-r--r-- | src/components/services/tabs/TabItem.js | 2 | ||||
-rw-r--r-- | src/components/ui/AppLoader/styles.js | 2 |
5 files changed, 5 insertions, 5 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({ | |||
37 | 37 | ||
38 | let transition = 'none'; | 38 | let transition = 'none'; |
39 | 39 | ||
40 | if (window.matchMedia('(prefers-reduced-motion: no-preference)')) { | 40 | if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) { |
41 | transition = 'all 0.25s'; | 41 | transition = 'all 0.25s'; |
42 | } | 42 | } |
43 | 43 | ||
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({ | |||
47 | 47 | ||
48 | let transition = 'none'; | 48 | let transition = 'none'; |
49 | 49 | ||
50 | if (window.matchMedia('(prefers-reduced-motion: no-preference)')) { | 50 | if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) { |
51 | transition = 'transform 0.5s ease'; | 51 | transition = 'transform 0.5s ease'; |
52 | } | 52 | } |
53 | 53 | ||
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({ | |||
26 | 26 | ||
27 | let buttonTransition = 'none'; | 27 | let buttonTransition = 'none'; |
28 | 28 | ||
29 | if (window.matchMedia('(prefers-reduced-motion: no-preference)')) { | 29 | if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) { |
30 | buttonTransition = 'opacity 0.25s'; | 30 | buttonTransition = 'opacity 0.25s'; |
31 | } | 31 | } |
32 | 32 | ||
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'; | |||
72 | let polledTransition = 'none'; | 72 | let polledTransition = 'none'; |
73 | let pollAnsweredTransition = 'none'; | 73 | let pollAnsweredTransition = 'none'; |
74 | 74 | ||
75 | if (window.matchMedia('(prefers-reduced-motion: no-preference)')) { | 75 | if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) { |
76 | pollIndicatorTransition = 'background 0.5s'; | 76 | pollIndicatorTransition = 'background 0.5s'; |
77 | polledTransition = 'background 0.1s'; | 77 | polledTransition = 'background 0.1s'; |
78 | pollAnsweredTransition = 'background 0.1s'; | 78 | 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 @@ | |||
1 | let sloganTransition = 'none'; | 1 | let sloganTransition = 'none'; |
2 | 2 | ||
3 | if (window.matchMedia('(prefers-reduced-motion: no-preference)')) { | 3 | if (window && window.matchMedia('(prefers-reduced-motion: no-preference)')) { |
4 | sloganTransition = 'opacity 1s ease'; | 4 | sloganTransition = 'opacity 1s ease'; |
5 | } | 5 | } |
6 | 6 | ||