Fixes #161

package.json

@@ -44,7 +44,7 @@
     "chai-as-promised": "^5.3.0",
     "cross-env": "^3.1.2",
     "devtron": "^1.3.0",
-    "electron": "1.4.2",
+    "electron": "1.4.6",
     "electron-builder": "^7.11.2",
     "electron-connect": "~0.6.0",
     "eslint": "^3.4.0",

src/browser/index.jsx

@@ -392,10 +392,10 @@ var MattermostView = React.createClass({
     var self = this;
     var webview = ReactDOM.findDOMNode(this.refs.webview);
 
-    // This option disables the same-origin policy and allows js/css/plugins not only content like images.
+    // This option allows insecure content, when set to true it is possible to
+    // load content via HTTP while the mattermost server serves HTTPS
     if (config.disablewebsecurity === true) {
-      // webview.setAttribute('disablewebsecurity', false) disables websecurity. (electron's bug?)
-      webview.setAttribute('disablewebsecurity', true);
+      webview.setAttribute('webpreferences', 'allowDisplayingInsecureContent');
     }
 
     webview.addEventListener('did-fail-load', (e) => {