Make "disablewebsecurity" optional

2016-04-17 23:07:17 +09:00
parent 2eae1d42d2
commit e1b008a3e0
3 changed files with 14 additions and 7 deletions
--- a/src/browser/index.jsx
+++ b/src/browser/index.jsx
@@ -247,8 +247,10 @@ var MattermostView = React.createClass({
    var webview = ReactDOM.findDOMNode(this.refs.webview);

    // This option disables the same-origin policy and allows js/css/plugins not only content like images.
-    // So this should not be enabled.
-    webview.setAttribute('disablewebsecurity', true);
+    if (config.disablewebsecurity === true) {
+      // webview.setAttribute('disablewebsecurity', false) disables websecurity. (electron's bug?)
+      webview.setAttribute('disablewebsecurity', true);
+    }

    webview.addEventListener('did-fail-load', function(e) {
      console.log(thisObj.props.name, 'webview did-fail-load', e);