diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-10-29 10:12:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-29 13:42:36 +0530 |
commit | 63fc46fd3f61cdee254e574338e06af4d9bb4dcb (patch) | |
tree | 3cd8083fdaf78dfb1511f15eefe77e36eb1e0d69 /src | |
parent | 5.6.3-nightly.46 [skip ci] (diff) | |
download | ferdium-app-63fc46fd3f61cdee254e574338e06af4d9bb4dcb.tar.gz ferdium-app-63fc46fd3f61cdee254e574338e06af4d9bb4dcb.tar.zst ferdium-app-63fc46fd3f61cdee254e574338e06af4d9bb4dcb.zip |
chore: use caret for dependencies instead of locked versions (#2162)
- use caret for all dependencies except brittle ones like e.g. typescript
- remove 'save-exact' true from .npmrc
- fix various prettier formatting issues
Diffstat (limited to 'src')
-rw-r--r-- | src/components/auth/Login.js | 4 | ||||
-rw-r--r-- | src/components/services/content/ServiceWebview.js | 28 | ||||
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 4 | ||||
-rw-r--r-- | src/stores/FeaturesStore.js | 8 | ||||
-rw-r--r-- | src/themes/index.ts | 3 |
5 files changed, 25 insertions, 22 deletions
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index 6ed89afb6..956205258 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js | |||
@@ -173,7 +173,9 @@ class Login extends Component { | |||
173 | <p className="error-message center"> | 173 | <p className="error-message center"> |
174 | {intl.formatMessage(messages.customServerQuestion)}{' '} | 174 | {intl.formatMessage(messages.customServerQuestion)}{' '} |
175 | <Link | 175 | <Link |
176 | to={`${window['ferdi'].stores.settings.all.app.server.replace( | 176 | to={`${window[ |
177 | 'ferdi' | ||
178 | ].stores.settings.all.app.server.replace( | ||
177 | API_VERSION, | 179 | API_VERSION, |
178 | '', | 180 | '', |
179 | )}/import`} | 181 | )}/import`} |
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js index 2562c09ce..187785f82 100644 --- a/src/components/services/content/ServiceWebview.js +++ b/src/components/services/content/ServiceWebview.js | |||
@@ -31,13 +31,15 @@ class ServiceWebview extends Component { | |||
31 | debug('Service logged a message:', e.message); | 31 | debug('Service logged a message:', e.message); |
32 | }); | 32 | }); |
33 | this.webview.view.addEventListener('did-navigate', () => { | 33 | this.webview.view.addEventListener('did-navigate', () => { |
34 | document.title = `Ferdi - ${this.props.service.name} ${this.props.service.dialogTitle | 34 | document.title = `Ferdi - ${this.props.service.name} ${ |
35 | ? ` - ${this.props.service.dialogTitle}` | 35 | this.props.service.dialogTitle |
36 | : '' | 36 | ? ` - ${this.props.service.dialogTitle}` |
37 | } ${`- ${this.props.service._webview.getTitle()}`}`; | 37 | : '' |
38 | }) | 38 | } ${`- ${this.props.service._webview.getTitle()}`}`; |
39 | }); | ||
39 | } | 40 | } |
40 | }) | 41 | }, |
42 | ); | ||
41 | } | 43 | } |
42 | 44 | ||
43 | componentWillUnmount() { | 45 | componentWillUnmount() { |
@@ -53,10 +55,11 @@ class ServiceWebview extends Component { | |||
53 | webview.view.blur(); | 55 | webview.view.blur(); |
54 | webview.view.focus(); | 56 | webview.view.focus(); |
55 | window.setTimeout(() => { | 57 | window.setTimeout(() => { |
56 | document.title = `Ferdi - ${this.props.service.name} ${this.props.service.dialogTitle | 58 | document.title = `Ferdi - ${this.props.service.name} ${ |
57 | ? ` - ${this.props.service.dialogTitle}` | 59 | this.props.service.dialogTitle |
58 | : '' | 60 | ? ` - ${this.props.service.dialogTitle}` |
59 | } ${`- ${this.props.service._webview.getTitle()}`}`; | 61 | : '' |
62 | } ${`- ${this.props.service._webview.getTitle()}`}`; | ||
60 | }, 100); | 63 | }, 100); |
61 | } else { | 64 | } else { |
62 | debug('Refocus not required - Not active service'); | 65 | debug('Refocus not required - Not active service'); |
@@ -103,8 +106,9 @@ class ServiceWebview extends Component { | |||
103 | } | 106 | } |
104 | allowpopups | 107 | allowpopups |
105 | nodeintegration | 108 | nodeintegration |
106 | webpreferences={`spellcheck=${isSpellcheckerEnabled ? 1 : 0 | 109 | webpreferences={`spellcheck=${ |
107 | }, contextIsolation=1, enableRemoteModule=1`} | 110 | isSpellcheckerEnabled ? 1 : 0 |
111 | }, contextIsolation=1, enableRemoteModule=1`} | ||
108 | /> | 112 | /> |
109 | ); | 113 | ); |
110 | } | 114 | } |
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 6b6f97e46..3e0736fb5 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -122,9 +122,7 @@ class AppLayoutContainer extends Component { | |||
122 | showMessageBadgeWhenMutedSetting={ | 122 | showMessageBadgeWhenMutedSetting={ |
123 | settings.all.app.showMessageBadgeWhenMuted | 123 | settings.all.app.showMessageBadgeWhenMuted |
124 | } | 124 | } |
125 | showServiceNameSetting={ | 125 | showServiceNameSetting={settings.all.app.showServiceName} |
126 | settings.all.app.showServiceName | ||
127 | } | ||
128 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} | 126 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} |
129 | isTodosServiceActive={services.isTodosServiceActive || false} | 127 | isTodosServiceActive={services.isTodosServiceActive || false} |
130 | /> | 128 | /> |
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js index fdb502b6b..26a045314 100644 --- a/src/stores/FeaturesStore.js +++ b/src/stores/FeaturesStore.js | |||
@@ -24,7 +24,7 @@ export default class FeaturesStore extends Store { | |||
24 | 'features', | 24 | 'features', |
25 | ); | 25 | ); |
26 | 26 | ||
27 | @observable features = { }; | 27 | @observable features = {}; |
28 | 28 | ||
29 | async setup() { | 29 | async setup() { |
30 | this.registerReactions([ | 30 | this.registerReactions([ |
@@ -37,13 +37,11 @@ export default class FeaturesStore extends Store { | |||
37 | } | 37 | } |
38 | 38 | ||
39 | @computed get anonymousFeatures() { | 39 | @computed get anonymousFeatures() { |
40 | return ( | 40 | return this.defaultFeaturesRequest.execute().result || {}; |
41 | this.defaultFeaturesRequest.execute().result || {} | ||
42 | ); | ||
43 | } | 41 | } |
44 | 42 | ||
45 | _updateFeatures = () => { | 43 | _updateFeatures = () => { |
46 | const features = { }; | 44 | const features = {}; |
47 | if (this.stores.user.isLoggedIn) { | 45 | if (this.stores.user.isLoggedIn) { |
48 | let requestResult = {}; | 46 | let requestResult = {}; |
49 | try { | 47 | try { |
diff --git a/src/themes/index.ts b/src/themes/index.ts index 27be4d04b..2e8527818 100644 --- a/src/themes/index.ts +++ b/src/themes/index.ts | |||
@@ -16,6 +16,7 @@ export function theme( | |||
16 | : makeDefaultThemeConfig(brandColor); | 16 | : makeDefaultThemeConfig(brandColor); |
17 | } | 17 | } |
18 | 18 | ||
19 | const defaultThemeConfigWithDefaultAccentColor = makeDefaultThemeConfig(themeBrandPrimary); | 19 | const defaultThemeConfigWithDefaultAccentColor = |
20 | makeDefaultThemeConfig(themeBrandPrimary); | ||
20 | 21 | ||
21 | export type Theme = typeof defaultThemeConfigWithDefaultAccentColor; | 22 | export type Theme = typeof defaultThemeConfigWithDefaultAccentColor; |