diff options
Diffstat (limited to 'src/components/services/content/ServiceWebview.js')
-rw-r--r-- | src/components/services/content/ServiceWebview.js | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js index a71017a6e..abbf21dee 100644 --- a/src/components/services/content/ServiceWebview.js +++ b/src/components/services/content/ServiceWebview.js | |||
@@ -16,6 +16,7 @@ export default class ServiceWebview extends Component { | |||
16 | service: PropTypes.instanceOf(ServiceModel).isRequired, | 16 | service: PropTypes.instanceOf(ServiceModel).isRequired, |
17 | setWebviewReference: PropTypes.func.isRequired, | 17 | setWebviewReference: PropTypes.func.isRequired, |
18 | reload: PropTypes.func.isRequired, | 18 | reload: PropTypes.func.isRequired, |
19 | isAppMuted: PropTypes.bool.isRequired, | ||
19 | enable: PropTypes.func.isRequired, | 20 | enable: PropTypes.func.isRequired, |
20 | }; | 21 | }; |
21 | 22 | ||
@@ -58,6 +59,7 @@ export default class ServiceWebview extends Component { | |||
58 | service, | 59 | service, |
59 | setWebviewReference, | 60 | setWebviewReference, |
60 | reload, | 61 | reload, |
62 | isAppMuted, | ||
61 | enable, | 63 | enable, |
62 | } = this.props; | 64 | } = this.props; |
63 | 65 | ||
@@ -90,31 +92,23 @@ export default class ServiceWebview extends Component { | |||
90 | enable={enable} | 92 | enable={enable} |
91 | /> | 93 | /> |
92 | )} | 94 | )} |
93 | {service.isEnabled && ( | 95 | <Webview |
94 | <div className="services__webview-wrapper"> | 96 | ref={(element) => { this.webview = element; }} |
95 | <Webview | 97 | autosize |
96 | ref={(element) => { this.webview = element; }} | 98 | src={service.url} |
97 | 99 | preload="./webview/plugin.js" | |
98 | autosize | 100 | partition={`persist:service-${service.id}`} |
99 | src={service.url} | 101 | onDidAttach={() => setWebviewReference({ |
100 | preload="./webview/plugin.js" | 102 | serviceId: service.id, |
101 | partition={`persist:service-${service.id}`} | 103 | webview: this.webview.view, |
102 | 104 | })} | |
103 | onDidAttach={() => setWebviewReference({ | 105 | onUpdateTargetUrl={this.updateTargetUrl} |
104 | serviceId: service.id, | 106 | useragent={service.userAgent} |
105 | webview: this.webview.view, | 107 | muted={isAppMuted || service.isMuted} |
106 | })} | 108 | disablewebsecurity |
107 | 109 | allowpopups | |
108 | onUpdateTargetUrl={this.updateTargetUrl} | 110 | /> |
109 | 111 | {statusBar} | |
110 | useragent={service.userAgent} | ||
111 | |||
112 | disablewebsecurity | ||
113 | allowpopups | ||
114 | /> | ||
115 | {statusBar} | ||
116 | </div> | ||
117 | )} | ||
118 | </div> | 112 | </div> |
119 | ); | 113 | ); |
120 | } | 114 | } |