From 0a1b0309b7a3e78f50ba4beee965ff6948386920 Mon Sep 17 00:00:00 2001 From: Kyle Kelley Date: Fri, 7 Apr 2017 09:36:04 -0700 Subject: [PATCH 1/2] ensure a trailing slash on the base_url --- notebook/static/terminal/js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notebook/static/terminal/js/main.js b/notebook/static/terminal/js/main.js index f84ab95d5..bfaa23c03 100644 --- a/notebook/static/terminal/js/main.js +++ b/notebook/static/terminal/js/main.js @@ -36,7 +36,7 @@ require([ // 1.02 here arrived at by trial and error to make the spacing look right var termColWidth = function() { return 1.02 * $("#dummy-screen-rows")[0].offsetWidth / 80;}; - var base_url = utils.get_body_data('baseUrl'); + var base_url = utils.get_body_data('baseUrl').replace(/\/?$/, '/'); var ws_path = utils.get_body_data('wsPath'); var ws_url = utils.get_body_data('wsUrl'); if (!ws_url) { From c3f1207c64b2df78845644cefe89cfba273f4b08 Mon Sep 17 00:00:00 2001 From: Min RK Date: Sat, 8 Apr 2017 10:15:28 +0200 Subject: [PATCH 2/2] fix add-trailing-slash login in base_url both leading and trailing slash should be added --- notebook/notebookapp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notebook/notebookapp.py b/notebook/notebookapp.py index 28f6496ec..80cc004f2 100755 --- a/notebook/notebookapp.py +++ b/notebook/notebookapp.py @@ -759,7 +759,7 @@ class NotebookApp(JupyterApp): value = proposal['value'] if not value.startswith('/'): value = '/' + value - elif not value.endswith('/'): + if not value.endswith('/'): value = value + '/' return value