diff options
author | 2019-10-18 20:15:56 +0200 | |
---|---|---|
committer | 2019-10-18 20:15:56 +0200 | |
commit | d443bca3c82230dd6b9c59d55fbde01a051a6ab5 (patch) | |
tree | 68751f48cc2ed70d0e78a1f5bb102ee9daedd334 /src/components/services/content | |
parent | Fix lint (diff) | |
parent | Fix lint (diff) | |
download | ferdium-app-d443bca3c82230dd6b9c59d55fbde01a051a6ab5.tar.gz ferdium-app-d443bca3c82230dd6b9c59d55fbde01a051a6ab5.tar.zst ferdium-app-d443bca3c82230dd6b9c59d55fbde01a051a6ab5.zip |
Merge branch 'develop' into local-server
Diffstat (limited to 'src/components/services/content')
-rw-r--r-- | src/components/services/content/ServiceView.js | 2 | ||||
-rw-r--r-- | src/components/services/content/Services.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index 664a494c1..49ee24361 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js | |||
@@ -15,7 +15,7 @@ import SettingsStore from '../../../stores/SettingsStore'; | |||
15 | import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen'; | 15 | import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen'; |
16 | import { CUSTOM_WEBSITE_ID } from '../../../features/webControls/constants'; | 16 | import { CUSTOM_WEBSITE_ID } from '../../../features/webControls/constants'; |
17 | 17 | ||
18 | export default @observer @inject('stores', 'actions') class ServiceView extends Component { | 18 | export default @inject('stores', 'actions') @observer class ServiceView extends Component { |
19 | static propTypes = { | 19 | static propTypes = { |
20 | service: PropTypes.instanceOf(ServiceModel).isRequired, | 20 | service: PropTypes.instanceOf(ServiceModel).isRequired, |
21 | setWebviewReference: PropTypes.func.isRequired, | 21 | setWebviewReference: PropTypes.func.isRequired, |
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index 6d7909362..80f17d8f2 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js | |||
@@ -44,7 +44,7 @@ const styles = { | |||
44 | }, | 44 | }, |
45 | }; | 45 | }; |
46 | 46 | ||
47 | export default @observer @inject('actions') @injectSheet(styles) class Services extends Component { | 47 | export default @injectSheet(styles) @inject('actions') @observer class Services extends Component { |
48 | static propTypes = { | 48 | static propTypes = { |
49 | services: MobxPropTypes.arrayOrObservableArray, | 49 | services: MobxPropTypes.arrayOrObservableArray, |
50 | setWebviewReference: PropTypes.func.isRequired, | 50 | setWebviewReference: PropTypes.func.isRequired, |