Improve custom CSS & JS implementation and tests.

xwmx · Nov 7, 2023 · 4ff8fde · 4ff8fde
1 parent 55b4638
commit 4ff8fde
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 10 deletions.
diff --git a/nb b/nb
@@ -10597,6 +10597,10 @@ _render() {
 
   # Usage: _render_print_head [--title <title>]
   _render_print_head() {
+    local _custom_css="${NB_CUSTOM_CSS:-}"
+    local _custom_css_element=
+    local _custom_javascript="${NB_CUSTOM_JAVASCRIPT:-${NB_CUSTOM_JS:-}}"
+    local _custom_javascript_element=
     local _html_title="${_ME}"
 
     if [[ "${1:-}" == "--title" ]] && [[ -n "${2:-}" ]]
@@ -10659,16 +10663,14 @@ _render() {
       esac
     fi
 
-    # Set custom JS
-    local _custom_js=""
-    if [[ "${NB_CUSTOM_JS-}" ]]; then
-      _custom_js="<script src='${NB_CUSTOM_JS}'></script>"
+    if [[ -n "${_custom_javascript:-}"  ]]
+    then
+      _custom_javascript_element="<script src='${_custom_javascript:-}'></script>"
     fi
 
-    # Set custom CSS
-    local _custom_css=""
-    if [[ "${NB_CUSTOM_CSS-}" ]]; then
-      _custom_css="<link rel='stylesheet' href='${NB_CUSTOM_CSS}'/>"
+    if [[ -n "${_custom_css:-}"         ]]
+    then
+      _custom_css_element="<link rel='stylesheet' href='${_custom_css:-}'/>"
     fi
 
     cat <<HEREDOC
@@ -11350,8 +11352,8 @@ document.addEventListener('keydown', function(event) {
   }
 });
 </script>
-${_custom_css}
-${_custom_js}
+${_custom_css_element:-}
+${_custom_javascript_element:-}
 <meta name="referrer" content="no-referrer" />
 </head>
 <body>

diff --git a/test/browse.bats b/test/browse.bats
@@ -2,6 +2,69 @@
 
 load test_helper
 
+# vustom css and javascript ####################################################
+
+@test "'browse' omits custom css or javascript tags by default." {
+  {
+    "${_NB}" init
+
+    sleep 1
+  }
+
+  run "${_NB}" browse --print
+
+  printf "\${status}: '%s'\\n" "${status}"
+  printf "\${output}: '%s'\\n" "${output}"
+
+  [[    "${status}"  -eq  0                           ]]
+
+  [[ !  "${output}"  =~   \<link\ rel=\'stylesheet\'  ]]
+  [[ !  "${output}"  =~   \<script\ src=              ]]
+}
+
+@test "'browse' includes custom css and javascript tags when assigned." {
+  {
+    "${_NB}" init
+
+    sleep 1
+
+    declare _custom_css=".example { color: blue; }"
+    declare _custom_js=
+    _custom_js="$(cat <<HEREDOC
+function example() { console.log("Example."); }
+HEREDOC
+    )"
+  }
+
+  NB_CUSTOM_CSS="${_custom_css:-}"  \
+    NB_CUSTOM_JS="${_custom_js:-}"  \
+    run "${_NB}" browse --print
+
+  printf "\${status}: '%s'\\n" "${status}"
+  printf "\${output}: '%s'\\n" "${output}"
+
+  [[    "${status}"  -eq  0 ]]
+
+  [[    "${output}"  =~   \
+\<link\ rel=\'stylesheet\'\ href=\'.example\ {\ color:\ blue\;\ }\'/\>                    ]]
+  [[    "${output}"  =~   \
+\<script\ src=\'function\ example\(\)\ {\ console.log\(\"Example.\"\)\;\ }\'\>\</script\> ]]
+
+  NB_CUSTOM_CSS="${_custom_css:-}"          \
+    NB_CUSTOM_JAVASCRIPT="${_custom_js:-}"  \
+    run "${_NB}" browse --print
+
+  printf "\${status}: '%s'\\n" "${status}"
+  printf "\${output}: '%s'\\n" "${output}"
+
+  [[    "${status}"  -eq  0 ]]
+
+  [[    "${output}"  =~   \
+\<link\ rel=\'stylesheet\'\ href=\'.example\ {\ color:\ blue\;\ }\'/\>                    ]]
+  [[    "${output}"  =~   \
+\<script\ src=\'function\ example\(\)\ {\ console.log\(\"Example.\"\)\;\ }\'\>\</script\> ]]
+}
+
 # configuration ###############################################################
 
 @test "'browse' sets the server hostname to localhost by default." {