diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-11-10 15:05:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-10 15:05:52 +0100 |
commit | 4f5dd248e23477a5a2ae55c63918b7308ffce99d (patch) | |
tree | 9606844c390deb0ba6647d70fb60e09318a6a900 /src/components/services/content/ServiceWebview.js | |
parent | Merge branch 'develop' of github.com:meetfranz/franz into develop (diff) | |
parent | get default local from default app config (diff) | |
download | ferdium-app-4f5dd248e23477a5a2ae55c63918b7308ffce99d.tar.gz ferdium-app-4f5dd248e23477a5a2ae55c63918b7308ffce99d.tar.zst ferdium-app-4f5dd248e23477a5a2ae55c63918b7308ffce99d.zip |
Merge pull request #248 from meetfranz/feature/192-display-disabled-services
Add option to show disabled services in tab bar
Diffstat (limited to 'src/components/services/content/ServiceWebview.js')
-rw-r--r-- | src/components/services/content/ServiceWebview.js | 56 |
1 files changed, 35 insertions, 21 deletions
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js index cd59e0a8a..a71017a6e 100644 --- a/src/components/services/content/ServiceWebview.js +++ b/src/components/services/content/ServiceWebview.js | |||
@@ -8,6 +8,7 @@ import classnames from 'classnames'; | |||
8 | import ServiceModel from '../../../models/Service'; | 8 | import ServiceModel from '../../../models/Service'; |
9 | import StatusBarTargetUrl from '../../ui/StatusBarTargetUrl'; | 9 | import StatusBarTargetUrl from '../../ui/StatusBarTargetUrl'; |
10 | import WebviewCrashHandler from './WebviewCrashHandler'; | 10 | import WebviewCrashHandler from './WebviewCrashHandler'; |
11 | import ServiceDisabled from './ServiceDisabled'; | ||
11 | 12 | ||
12 | @observer | 13 | @observer |
13 | export default class ServiceWebview extends Component { | 14 | export default class ServiceWebview extends Component { |
@@ -15,6 +16,7 @@ export default class ServiceWebview extends Component { | |||
15 | service: PropTypes.instanceOf(ServiceModel).isRequired, | 16 | service: PropTypes.instanceOf(ServiceModel).isRequired, |
16 | setWebviewReference: PropTypes.func.isRequired, | 17 | setWebviewReference: PropTypes.func.isRequired, |
17 | reload: PropTypes.func.isRequired, | 18 | reload: PropTypes.func.isRequired, |
19 | enable: PropTypes.func.isRequired, | ||
18 | }; | 20 | }; |
19 | 21 | ||
20 | static defaultProps = { | 22 | static defaultProps = { |
@@ -56,6 +58,7 @@ export default class ServiceWebview extends Component { | |||
56 | service, | 58 | service, |
57 | setWebviewReference, | 59 | setWebviewReference, |
58 | reload, | 60 | reload, |
61 | enable, | ||
59 | } = this.props; | 62 | } = this.props; |
60 | 63 | ||
61 | const webviewClasses = classnames({ | 64 | const webviewClasses = classnames({ |
@@ -80,27 +83,38 @@ export default class ServiceWebview extends Component { | |||
80 | reload={reload} | 83 | reload={reload} |
81 | /> | 84 | /> |
82 | )} | 85 | )} |
83 | <Webview | 86 | {!service.isEnabled && ( |
84 | ref={(element) => { this.webview = element; }} | 87 | <ServiceDisabled |
85 | 88 | name={service.recipe.name} | |
86 | autosize | 89 | webview={service.webview} |
87 | src={service.url} | 90 | enable={enable} |
88 | preload="./webview/plugin.js" | 91 | /> |
89 | partition={`persist:service-${service.id}`} | 92 | )} |
90 | 93 | {service.isEnabled && ( | |
91 | onDidAttach={() => setWebviewReference({ | 94 | <div className="services__webview-wrapper"> |
92 | serviceId: service.id, | 95 | <Webview |
93 | webview: this.webview.view, | 96 | ref={(element) => { this.webview = element; }} |
94 | })} | 97 | |
95 | 98 | autosize | |
96 | onUpdateTargetUrl={this.updateTargetUrl} | 99 | src={service.url} |
97 | 100 | preload="./webview/plugin.js" | |
98 | useragent={service.userAgent} | 101 | partition={`persist:service-${service.id}`} |
99 | 102 | ||
100 | disablewebsecurity | 103 | onDidAttach={() => setWebviewReference({ |
101 | allowpopups | 104 | serviceId: service.id, |
102 | /> | 105 | webview: this.webview.view, |
103 | {statusBar} | 106 | })} |
107 | |||
108 | onUpdateTargetUrl={this.updateTargetUrl} | ||
109 | |||
110 | useragent={service.userAgent} | ||
111 | |||
112 | disablewebsecurity | ||
113 | allowpopups | ||
114 | /> | ||
115 | {statusBar} | ||
116 | </div> | ||
117 | )} | ||
104 | </div> | 118 | </div> |
105 | ); | 119 | ); |
106 | } | 120 | } |