Move boolean check

NiklasMerz · NiklasMerz · commit d3349f71eb66 · 2020-03-04T11:33:03.000+01:00
diff --git a/src/www/util.js b/src/www/util.js
@@ -13,10 +13,10 @@ var WebView = {
     if (url.startsWith('file://')) {
       return window.WEBVIEW_SERVER_URL + url.replace('file://', '/_app_file_');
     }
-    if (url.startsWith('http://') && convertHttp) {
+    if (convertHttp && url.startsWith('http://')) {
       return window.WEBVIEW_SERVER_URL + encodeURIComponent(url.replace('http://', '/_http_proxy_'));
     }
-    if (url.startsWith('https://') && convertHttp) {
+    if (convertHttp && url.startsWith('https://')) {
       return window.WEBVIEW_SERVER_URL + encodeURIComponent(url.replace('https://', '/_https_proxy_'));
     }
     if (url.startsWith('content://')) {

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@ var WebView = {`
`13`	`13`	`if (url.startsWith('file://')) {`
`14`	`14`	`return window.WEBVIEW_SERVER_URL + url.replace('file://', '/_app_file_');`
`15`	`15`	`}`
`16`		`- if (url.startsWith('http://') && convertHttp) {`
	`16`	`+ if (convertHttp && url.startsWith('http://')) {`
`17`	`17`	`return window.WEBVIEW_SERVER_URL + encodeURIComponent(url.replace('http://', '/_http_proxy_'));`
`18`	`18`	`}`
`19`		`- if (url.startsWith('https://') && convertHttp) {`
	`19`	`+ if (convertHttp && url.startsWith('https://')) {`
`20`	`20`	`return window.WEBVIEW_SERVER_URL + encodeURIComponent(url.replace('https://', '/_https_proxy_'));`
`21`	`21`	`}`
`22`	`22`	`if (url.startsWith('content://')) {`