Merge pull request #1802 from ashishdahiya/ws_url

minrk · web-flow · commit 884eb8c4ad82 · 2016-10-04T16:15:59.000+02:00
Set ws-url data attribute when accessing a notebook terminal
diff --git a/notebook/static/terminal/js/main.js b/notebook/static/terminal/js/main.js
@@ -38,8 +38,12 @@ require([
 
     var base_url = utils.get_body_data('baseUrl');
     var ws_path = utils.get_body_data('wsPath');
-    var ws_url = location.protocol.replace('http', 'ws') + "//" + location.host
-                                    + base_url + ws_path;
+    var ws_url = utils.get_body_data('wsUrl');
+    if (!ws_url) {
+        // trailing 's' in https will become wss for secure web sockets
+        ws_url = location.protocol.replace('http', 'ws') + "//" + location.host;
+    }
+    ws_url = ws_url + base_url + ws_path;
     
     var header = $("#header")[0];
 
diff --git a/notebook/templates/terminal.html b/notebook/templates/terminal.html
@@ -7,6 +7,7 @@
 {% block params %}
 
 data-base-url="{{base_url | urlencode}}"
+data-ws-url="{{ws_url | urlencode}}"
 data-ws-path="{{ws_path}}"
 
 {% endblock %}
