fix(webterminal): test

static/js/webterminal.js

@@ -2,12 +2,22 @@
  * Created by liuzheng on 3/3/16.
  */
 var rowHeight = 1;
-            var colWidth = 1;
-            function WSSHClient() {
+var colWidth = 1;
+function WSSHClient() {
+}
+WSSHClient.prototype._generateEndpoint = function (options) {
+    console.log(options);
+    if (window.location.protocol == 'https:') {
+        var protocol = 'wss://';
+    } else {
+        var protocol = 'ws://';
     }
 
-            WSSHClient.prototype.connect = function(options) {
-                var endpoint = '{{ web_terminal_url }}';
+    var endpoint = protocol + window.location.host + ':8080' + '/terminal';
+    return endpoint;
+};
+WSSHClient.prototype.connect = function (options) {
+    var endpoint = this._generateEndpoint(options);
 
     if (window.WebSocket) {
         this._connection = new WebSocket(endpoint);
@@ -17,10 +27,10 @@ var rowHeight = 1;
     }
     else {
         options.onError('WebSocket Not Supported');
-                    return ;
+        return;
     }
 
-                this._connection.onopen = function() {
+    this._connection.onopen = function () {
         options.onConnect();
     };
 
@@ -34,18 +44,18 @@ var rowHeight = 1;
         }
     };
 
-                this._connection.onclose = function(evt) {
+    this._connection.onclose = function (evt) {
         options.onClose();
     };
-            };
+};
 
-            WSSHClient.prototype.send = function(data) {
+WSSHClient.prototype.send = function (data) {
     this._connection.send(JSON.stringify({'data': data}));
-            };
+};
 
-            function openTerminal(options) {
+function openTerminal(options) {
     var client = new WSSHClient();
-                var term = new Terminal(80, 24, function(key) {
+    var term = new Terminal(80, 24, function (key) {
         client.send(key);
     });
     term.open();
@@ -53,44 +63,43 @@ var rowHeight = 1;
     term.resize(80, 24);
     term.write('Connecting...');
     client.connect($.extend(options, {
-                    onError: function(error) {
+        onError: function (error) {
             term.write('Error: ' + error + '\r\n');
         },
-                    onConnect: function() {
+        onConnect: function () {
             // Erase our connecting message
             term.write('\r');
         },
-                    onClose: function() {
+        onClose: function () {
             term.write('Connection Reset By Peer');
         },
-                    onData: function(data) {
+        onData: function (data) {
             term.write(data);
         }
     }));
-                rowHeight = 0.0 + 1.00 * $('.terminal').height() / 24 ;
+    rowHeight = 0.0 + 1.00 * $('.terminal').height() / 24;
     colWidth = 0.0 + 1.00 * $('.terminal').width() / 80;
     return {'term': term, 'client': client};
-            }
+}
 
-            function resize(){
-                $('.terminal').css('width', window.innerWidth-25);
+function resize() {
+    $('.terminal').css('width', window.innerWidth - 25);
     console.log(window.innerWidth);
-                console.log(window.innerWidth-10);
-                var rows = Math.floor(window.innerHeight/rowHeight) - 2;
-                var cols = Math.floor(window.innerWidth/colWidth) - 1;
+    console.log(window.innerWidth - 10);
+    var rows = Math.floor(window.innerHeight / rowHeight) - 2;
+    var cols = Math.floor(window.innerWidth / colWidth) - 1;
 
     return {rows: rows, cols: cols};
-            }
+}
 
-            $(document).ready(function() {
-                var options = {
-                };
+$(document).ready(function () {
+    var options = {};
 
     $('#ssh').show();
     var term_client = openTerminal(options);
     console.log(rowHeight);
 
-                window.onresize = function(){
+    window.onresize = function () {
         var geom = resize();
         console.log(geom);
         term_client.term.resize(geom.cols, geom.rows);
@@ -98,4 +107,4 @@ var rowHeight = 1;
         $('#ssh').show();
     }
 
-            });
+});