Change local storage to session storage, fix bugs with undefined js variable

Author: BarkingBad

scaladoc-js/src/versions-dropdown/DropdownHandler.scala

@@ -35,20 +35,21 @@ class DropdownHandler:
 
   private def getURLContent(url: String): Future[String] = Ajax.get(url).map(_.responseText)
 
-  window.localStorage.getItem(KEY) match
+  window.sessionStorage.getItem(KEY) match
     case null => // If no key, returns null
-      Globals.versionsDictionaryUrl match
-        case null => // global property not defined
-          // do nothing
-        case url: String =>
-          getURLContent(url).onComplete {
-            case Success(json: String) =>
-              window.localStorage.setItem(KEY, json)
-              addVersionsList(json)
-            case Failure(_) =>
-              window.localStorage.setItem(KEY, UNDEFINED_VERSIONS)
-              disableButton()
-          }
+      try
+        getURLContent(Globals.versionsDictionaryUrl).onComplete {
+          case Success(json: String) =>
+            window.sessionStorage.setItem(KEY, json)
+            addVersionsList(json)
+          case Failure(_) =>
+            window.sessionStorage.setItem(KEY, UNDEFINED_VERSIONS)
+            disableButton()
+        }
+      catch // Globals.versionDictionaruUrl is undefined
+        case e =>
+          window.sessionStorage.setItem(KEY, UNDEFINED_VERSIONS)
+          disableButton()
     case value => value match
       case UNDEFINED_VERSIONS =>
         disableButton()
@@ -64,7 +65,7 @@ class DropdownHandler:
   document.getElementById("version").asInstanceOf[html.Span].onclick = (e: Event) => {
     e.stopPropagation
   }
-
+end DropdownHandler
 
 @JSExportTopLevel("dropdownHandler")
 def dropdownHandler() =

scaladoc/resources/dotty_res/styles/scalastyle.css

@@ -842,5 +842,17 @@ footer {
 /* Change color of dropdown links on hover */
 .dropdown-content a:hover {background-color: #f1f1f1}
 
+.arrow-down {
+  content: "\e903"; /* arrow down */
+  font-family: "dotty-icons" !important;
+  font-size: 20px;
+  line-height: var(--leftbar-font-size);
+  color: var(--leftbar-fg);
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+}
+
 /* Show the dropdown menu (use JS to add this class to the .dropdown-content container when the user clicks on the dropdown button) */
 .show {display:block;}

scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala

@@ -225,7 +225,10 @@ class HtmlRenderer(rootPackage: Member, val members: Map[DRI, Member])(using ctx
           ),
           span(id := "version")(
             div(cls := "versions-dropdown")(
-              div(onclick := "dropdownHandler()", id := "dropdown-button", cls := "dropdownbtn dropdownbtnactive")(args.projectVersion.map(v => div(cls:="projectVersion")(v)).toList),
+              div(onclick := "dropdownHandler()", id := "dropdown-button", cls := "dropdownbtn dropdownbtnactive")(
+                args.projectVersion.map(v => div(cls:="projectVersion")(v)).getOrElse(""),
+                div(cls := "arrow-down")
+              ),
               div(id := "dropdown-content", cls := "dropdown-content")(
                 input(`type` := "text", placeholder := "Search...", id := "dropdown-input", onkeyup := "filterFunction()"),
               ),