Merge pull request #880 from glowing-bear/fix-tls-warning

PLS TEST: Fix non-TLS warning
This commit is contained in:
Lorenz Hübschle-Schneider 2016-12-28 12:19:04 +01:00 committed by GitHub
commit cd44173957

View file

@ -107,7 +107,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
// except for local instances (testing or electron)
$scope.show_tls_warning = (window.location.protocol !== "https:") &&
(["localhost", "127.0.0.1", "::1"].indexOf(window.location.hostname) === -1) &&
!window.is_electron && (cordova === null);
!window.is_electron && !window.cordova;
if (window.is_electron) {
// Use packaged emojione sprite in the electron app