diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-11-21 22:01:52 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2017-11-21 22:01:52 +0100 |
commit | b4ea8dbf0d266d72c5cd9de2bbd6eb68534f6271 (patch) | |
tree | 62a8883ffdda0b3ffd7a66e3feacab136edf0662 | |
parent | Merge pull request #321 from meetfranz/feature/miner-optimization (diff) | |
download | ferdium-app-b4ea8dbf0d266d72c5cd9de2bbd6eb68534f6271.tar.gz ferdium-app-b4ea8dbf0d266d72c5cd9de2bbd6eb68534f6271.tar.zst ferdium-app-b4ea8dbf0d266d72c5cd9de2bbd6eb68534f6271.zip |
fix merging issue
-rw-r--r-- | src/components/services/content/ServiceWebview.js | 35 | ||||
-rw-r--r-- | src/index.js | 2 |
2 files changed, 19 insertions, 18 deletions
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js index abbf21dee..faa356d3d 100644 --- a/src/components/services/content/ServiceWebview.js +++ b/src/components/services/content/ServiceWebview.js | |||
@@ -85,29 +85,30 @@ export default class ServiceWebview extends Component { | |||
85 | reload={reload} | 85 | reload={reload} |
86 | /> | 86 | /> |
87 | )} | 87 | )} |
88 | {!service.isEnabled && ( | 88 | {!service.isEnabled ? ( |
89 | <ServiceDisabled | 89 | <ServiceDisabled |
90 | name={service.recipe.name} | 90 | name={service.recipe.name} |
91 | webview={service.webview} | 91 | webview={service.webview} |
92 | enable={enable} | 92 | enable={enable} |
93 | /> | 93 | /> |
94 | ) : ( | ||
95 | <Webview | ||
96 | ref={(element) => { this.webview = element; }} | ||
97 | autosize | ||
98 | src={service.url} | ||
99 | preload="./webview/plugin.js" | ||
100 | partition={`persist:service-${service.id}`} | ||
101 | onDidAttach={() => setWebviewReference({ | ||
102 | serviceId: service.id, | ||
103 | webview: this.webview.view, | ||
104 | })} | ||
105 | onUpdateTargetUrl={this.updateTargetUrl} | ||
106 | useragent={service.userAgent} | ||
107 | muted={isAppMuted || service.isMuted} | ||
108 | disablewebsecurity | ||
109 | allowpopups | ||
110 | /> | ||
94 | )} | 111 | )} |
95 | <Webview | ||
96 | ref={(element) => { this.webview = element; }} | ||
97 | autosize | ||
98 | src={service.url} | ||
99 | preload="./webview/plugin.js" | ||
100 | partition={`persist:service-${service.id}`} | ||
101 | onDidAttach={() => setWebviewReference({ | ||
102 | serviceId: service.id, | ||
103 | webview: this.webview.view, | ||
104 | })} | ||
105 | onUpdateTargetUrl={this.updateTargetUrl} | ||
106 | useragent={service.userAgent} | ||
107 | muted={isAppMuted || service.isMuted} | ||
108 | disablewebsecurity | ||
109 | allowpopups | ||
110 | /> | ||
111 | {statusBar} | 112 | {statusBar} |
112 | </div> | 113 | </div> |
113 | ); | 114 | ); |
diff --git a/src/index.js b/src/index.js index f4e906330..e21666086 100644 --- a/src/index.js +++ b/src/index.js | |||
@@ -58,7 +58,7 @@ const createWindow = () => { | |||
58 | width: mainWindowState.width, | 58 | width: mainWindowState.width, |
59 | height: mainWindowState.height, | 59 | height: mainWindowState.height, |
60 | minWidth: 600, | 60 | minWidth: 600, |
61 | minHeight: 400, | 61 | minHeight: 500, |
62 | titleBarStyle: 'hidden', | 62 | titleBarStyle: 'hidden', |
63 | backgroundColor: '#3498db', | 63 | backgroundColor: '#3498db', |
64 | autoHideMenuBar: true, | 64 | autoHideMenuBar: true, |