Merge pull request #644 from glowing-bear/url-hash

Add support for supplying credentials in the URL via the hash.
10 years ago · 9f6f70eb3e
parent cf771eb73f fafed6a915
commit 9f6f70eb3e
2 changed files with 20 additions and 1 deletions
--- a/index.html
+++ b/index.html
@ -40,7 +40,7 @@
    <script type="text/javascript" src="js/plugins.js"></script>
    <script type="text/javascript" src="3rdparty/favico-0.3.5.min.js"></script>
  </head>
-  <body ng-controller="WeechatCtrl" ng-keydown="handleKeyPress($event)" ng-keyup="handleKeyRelease($event)"  ng-keypress="handleKeyPress($event)" ng-class="{'no-overflow': connected}" lang="en-US">
+  <body ng-controller="WeechatCtrl" ng-keydown="handleKeyPress($event)" ng-keyup="handleKeyRelease($event)"  ng-keypress="handleKeyPress($event)" ng-class="{'no-overflow': connected}" ng-init="init()" lang="en-US">
    <div ng-hide="connected" class="container">
      <h2>
        <img alt="logo" src="assets/img/glowing-bear.svg">
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@ -760,6 +760,25 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
        }
    };

+    $scope.init = function() {
+        if (window.location.hash) {
+            var rawStr = atob(window.location.hash.substring(1));
+            window.location.hash = "";
+            var spl = rawStr.split(":");
+            var host = spl[0];
+            var port = parseInt(spl[1]);
+            var password = spl[2];
+            var ssl = spl.length > 3;
+            notifications.requestNotificationPermission();
+            $rootScope.sslError = false;
+            $rootScope.securityError = false;
+            $rootScope.errorMessage = false;
+            $rootScope.bufferBottom = true;
+            $scope.connectbutton = 'Connecting ...';
+            connection.connect(host, port, password, ssl);
+        }
+    };
+
 }]);

 weechat.config(['$routeProvider',