aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2017-12-22 23:33:35 +0100
committerLibravatar GitHub <noreply@github.com>2017-12-22 23:33:35 +0100
commitb0ac4fc169e93ee2d90e7b4c56a19a7b4fdc7584 (patch)
tree0cd61ceb0f85bde2ab62286e1fda65188d9fe3f4
parentremove debugging tests (diff)
parentRemoving explicit disabling of web security setting for the WebView controls (diff)
downloadferdium-app-b0ac4fc169e93ee2d90e7b4c56a19a7b4fdc7584.tar.gz
ferdium-app-b0ac4fc169e93ee2d90e7b4c56a19a7b4fdc7584.tar.zst
ferdium-app-b0ac4fc169e93ee2d90e7b4c56a19a7b4fdc7584.zip
Merge pull request #494 from heavypackets/websecurity-enable-patch
Removing explicit disabling of web security setting for the WebView controls
-rw-r--r--src/components/services/content/ServiceWebview.js1
-rw-r--r--src/components/ui/SubscriptionPopup.js1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 842fde76d..c146abf4e 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -106,7 +106,6 @@ export default class ServiceWebview extends Component {
106 onUpdateTargetUrl={this.updateTargetUrl} 106 onUpdateTargetUrl={this.updateTargetUrl}
107 useragent={service.userAgent} 107 useragent={service.userAgent}
108 muted={isAppMuted || service.isMuted} 108 muted={isAppMuted || service.isMuted}
109 disablewebsecurity
110 allowpopups 109 allowpopups
111 /> 110 />
112 )} 111 )}
diff --git a/src/components/ui/SubscriptionPopup.js b/src/components/ui/SubscriptionPopup.js
index 5aae2c47a..528d02907 100644
--- a/src/components/ui/SubscriptionPopup.js
+++ b/src/components/ui/SubscriptionPopup.js
@@ -58,7 +58,6 @@ export default class SubscriptionPopup extends Component {
58 58
59 autosize 59 autosize
60 src={encodeURI(url)} 60 src={encodeURI(url)}
61 disablewebsecurity
62 onDidNavigate={completeCheck} 61 onDidNavigate={completeCheck}
63 // onNewWindow={(event, url, frameName, options) => 62 // onNewWindow={(event, url, frameName, options) =>
64 // openWindow({ event, url, frameName, options })} 63 // openWindow({ event, url, frameName, options })}