diff options
Diffstat (limited to 'src/components/services/content')
7 files changed, 13 insertions, 19 deletions
diff --git a/src/components/services/content/ConnectionLostBanner.js b/src/components/services/content/ConnectionLostBanner.js index b9e7eca53..5adb22c84 100644 --- a/src/components/services/content/ConnectionLostBanner.js +++ b/src/components/services/content/ConnectionLostBanner.js | |||
@@ -68,8 +68,6 @@ const styles = theme => ({ | |||
68 | }, | 68 | }, |
69 | }); | 69 | }); |
70 | 70 | ||
71 | @injectSheet(styles) | ||
72 | @observer | ||
73 | class ConnectionLostBanner extends Component { | 71 | class ConnectionLostBanner extends Component { |
74 | static propTypes = { | 72 | static propTypes = { |
75 | classes: PropTypes.object.isRequired, | 73 | classes: PropTypes.object.isRequired, |
@@ -103,4 +101,4 @@ class ConnectionLostBanner extends Component { | |||
103 | } | 101 | } |
104 | } | 102 | } |
105 | 103 | ||
106 | export default injectIntl(ConnectionLostBanner); | 104 | export default injectIntl(injectSheet(styles)(observer(ConnectionLostBanner))); |
diff --git a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js index 5c93de80f..d605b3a52 100644 --- a/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js +++ b/src/components/services/content/ErrorHandlers/WebviewErrorHandler.js | |||
@@ -31,8 +31,6 @@ const messages = defineMessages({ | |||
31 | }, | 31 | }, |
32 | }); | 32 | }); |
33 | 33 | ||
34 | @injectSheet(styles) | ||
35 | @observer | ||
36 | class WebviewErrorHandler extends Component { | 34 | class WebviewErrorHandler extends Component { |
37 | static propTypes = { | 35 | static propTypes = { |
38 | name: PropTypes.string.isRequired, | 36 | name: PropTypes.string.isRequired, |
@@ -71,4 +69,6 @@ class WebviewErrorHandler extends Component { | |||
71 | } | 69 | } |
72 | } | 70 | } |
73 | 71 | ||
74 | export default injectIntl(WebviewErrorHandler); | 72 | export default injectIntl( |
73 | injectSheet(styles, { injectTheme: true })(observer(WebviewErrorHandler)), | ||
74 | ); | ||
diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js index f60d4bca6..b4658618e 100644 --- a/src/components/services/content/ServiceDisabled.js +++ b/src/components/services/content/ServiceDisabled.js | |||
@@ -16,7 +16,6 @@ const messages = defineMessages({ | |||
16 | }, | 16 | }, |
17 | }); | 17 | }); |
18 | 18 | ||
19 | @observer | ||
20 | class ServiceDisabled extends Component { | 19 | class ServiceDisabled extends Component { |
21 | static propTypes = { | 20 | static propTypes = { |
22 | name: PropTypes.string.isRequired, | 21 | name: PropTypes.string.isRequired, |
@@ -40,4 +39,4 @@ class ServiceDisabled extends Component { | |||
40 | } | 39 | } |
41 | } | 40 | } |
42 | 41 | ||
43 | export default injectIntl(ServiceDisabled); | 42 | export default injectIntl(observer(ServiceDisabled)); |
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index 1ffdd2153..6fc1f1400 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js | |||
@@ -16,8 +16,6 @@ import SettingsStore from '../../../stores/SettingsStore'; | |||
16 | import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen'; | 16 | import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen'; |
17 | import { CUSTOM_WEBSITE_RECIPE_ID } from '../../../config'; | 17 | import { CUSTOM_WEBSITE_RECIPE_ID } from '../../../config'; |
18 | 18 | ||
19 | @inject('stores', 'actions') | ||
20 | @observer | ||
21 | class ServiceView extends Component { | 19 | class ServiceView extends Component { |
22 | static propTypes = { | 20 | static propTypes = { |
23 | service: PropTypes.instanceOf(ServiceModel).isRequired, | 21 | service: PropTypes.instanceOf(ServiceModel).isRequired, |
@@ -163,4 +161,4 @@ class ServiceView extends Component { | |||
163 | } | 161 | } |
164 | } | 162 | } |
165 | 163 | ||
166 | export default ServiceView; | 164 | export default inject('stores', 'actions')(observer(ServiceView)); |
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js index c70494edd..713a0c21d 100644 --- a/src/components/services/content/ServiceWebview.js +++ b/src/components/services/content/ServiceWebview.js | |||
@@ -9,7 +9,6 @@ import ServiceModel from '../../../models/Service'; | |||
9 | 9 | ||
10 | const debug = require('debug')('Ferdi:Services'); | 10 | const debug = require('debug')('Ferdi:Services'); |
11 | 11 | ||
12 | @observer | ||
13 | class ServiceWebview extends Component { | 12 | class ServiceWebview extends Component { |
14 | static propTypes = { | 13 | static propTypes = { |
15 | service: PropTypes.instanceOf(ServiceModel).isRequired, | 14 | service: PropTypes.instanceOf(ServiceModel).isRequired, |
@@ -116,4 +115,4 @@ class ServiceWebview extends Component { | |||
116 | } | 115 | } |
117 | } | 116 | } |
118 | 117 | ||
119 | export default ServiceWebview; | 118 | export default observer(ServiceWebview); |
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index 1edf31bd3..0587b553f 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js | |||
@@ -44,9 +44,6 @@ const styles = { | |||
44 | }, | 44 | }, |
45 | }; | 45 | }; |
46 | 46 | ||
47 | @injectSheet(styles) | ||
48 | @inject('actions') | ||
49 | @observer | ||
50 | class Services extends Component { | 47 | class Services extends Component { |
51 | static propTypes = { | 48 | static propTypes = { |
52 | services: MobxPropTypes.arrayOrObservableArray, | 49 | services: MobxPropTypes.arrayOrObservableArray, |
@@ -197,4 +194,8 @@ class Services extends Component { | |||
197 | } | 194 | } |
198 | } | 195 | } |
199 | 196 | ||
200 | export default injectIntl(Services); | 197 | export default injectIntl( |
198 | injectSheet(styles, { injectTheme: true })( | ||
199 | inject('actions')(observer(Services)), | ||
200 | ), | ||
201 | ); | ||
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js index 3607435b3..1ca5ba415 100644 --- a/src/components/services/content/WebviewCrashHandler.js +++ b/src/components/services/content/WebviewCrashHandler.js | |||
@@ -26,7 +26,6 @@ const messages = defineMessages({ | |||
26 | }, | 26 | }, |
27 | }); | 27 | }); |
28 | 28 | ||
29 | @observer | ||
30 | class WebviewCrashHandler extends Component { | 29 | class WebviewCrashHandler extends Component { |
31 | static propTypes = { | 30 | static propTypes = { |
32 | name: PropTypes.string.isRequired, | 31 | name: PropTypes.string.isRequired, |
@@ -81,4 +80,4 @@ class WebviewCrashHandler extends Component { | |||
81 | } | 80 | } |
82 | } | 81 | } |
83 | 82 | ||
84 | export default injectIntl(WebviewCrashHandler); | 83 | export default injectIntl(observer(WebviewCrashHandler)); |