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

PLS TEST: Fix non-TLS warning
9 years ago · cd44173957
parent e5b4c33ac5 079f84818f
commit cd44173957
1 changed files with 1 additions and 1 deletions
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@ -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