Merge branch 'release/v1.2.1'

2016-06-01 23:04:40 +09:00
parent aa92ee26e7 ff5457ad98
commit bd25d254d3
8 changed files with 105 additions and 16 deletions
--- a/src/browser/index.jsx
+++ b/src/browser/index.jsx
@@ -317,6 +317,7 @@ var MattermostView = React.createClass({
      var currentURL = url.parse(webview.getURL());
      var destURL = url.parse(e.url);
      if (destURL.protocol !== 'http:' && destURL.protocol !== 'https:') {
+        ipcRenderer.send('confirm-protocol', destURL.protocol, e.url);
        return;
      }
      if (currentURL.host === destURL.host) {