Skip to content

Commit 5e0dfba

Browse files
committed
Update scala-js-dom
1 parent 6efcdba commit 5e0dfba

File tree

5 files changed

+17
-16
lines changed

5 files changed

+17
-16
lines changed

project/Build.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1688,7 +1688,7 @@ object Build {
16881688
lazy val `scaladoc-js-common` = project.in(file("scaladoc-js/common")).
16891689
enablePlugins(DottyJSPlugin).
16901690
dependsOn(`scala3-library-bootstrappedJS`).
1691-
settings(libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").cross(CrossVersion.for3Use2_13))
1691+
settings(libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "2.8.0"))
16921692

16931693
lazy val `scaladoc-js-main` = project.in(file("scaladoc-js/main")).
16941694
enablePlugins(DottyJSPlugin).
@@ -1704,7 +1704,7 @@ object Build {
17041704
settings(
17051705
Test / fork := false,
17061706
scalaJSUseMainModuleInitializer := true,
1707-
libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "1.1.0").cross(CrossVersion.for3Use2_13)
1707+
libraryDependencies += ("org.scala-js" %%% "scalajs-dom" % "2.8.0")
17081708
)
17091709

17101710
def generateDocumentation(configTask: Def.Initialize[Task[GenerationConfig]]) =

scaladoc-js/contributors/src/content-contributors/ContentContributors.scala

+7-6
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import org.scalajs.dom.ext._
55

66
import scala.util.matching.Regex._
77
import scala.util.matching._
8-
import org.scalajs.dom.ext.Ajax
9-
import scala.scalajs.js.JSON
8+
import org.scalajs.dom._
109
import scala.scalajs.js
10+
import scala.scalajs.js.JSON
11+
import scala.scalajs.js.Thenable.Implicits.thenable2future
1112

1213
import scala.concurrent.ExecutionContext.Implicits.global
1314
import scala.concurrent.Future
@@ -55,8 +56,8 @@ class ContentContributors:
5556
def linkForFilename(filename: String) = githubContributorsUrl() + s"/commits?path=$filename"
5657
def getAuthorsForFilename(filename: String): Future[List[FullAuthor]] = {
5758
val link = linkForFilename(filename)
58-
Ajax.get(link).map(_.responseText).flatMap { json =>
59-
val res = JSON.parse(json).asInstanceOf[Commits]
59+
fetch(link).flatMap(_.json()).flatMap { json =>
60+
val res = json.asInstanceOf[Commits]
6061
val authors = res.map { commit =>
6162
commit.author match
6263
case null =>
@@ -79,8 +80,8 @@ class ContentContributors:
7980
}
8081
}
8182
def findRename(link: String, filename: String): Future[Option[String]] = {
82-
Ajax.get(link).map(_.responseText).map { json =>
83-
val res = JSON.parse(json).asInstanceOf[CommitDescription]
83+
fetch(link).flatMap(_.json()).map { json =>
84+
val res = json.asInstanceOf[CommitDescription]
8485
val files = res.files
8586
files
8687
.find(_.filename == filename)

scaladoc-js/main/src/searchbar/SearchbarComponent.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class SearchbarComponent(engine: PageSearchEngine, inkuireEngine: InkuireJSSearc
148148
val htmlEntries = results.map(result => result.pageEntry.toHTML(result.indices))
149149
val loadMoreElement = createLoadMoreElement
150150

151-
def loadMoreResults(entries: List[raw.HTMLElement]): Unit = {
151+
def loadMoreResults(entries: List[HTMLElement]): Unit = {
152152
loadMoreElement.onclick = (event: Event) => {
153153
entries.take(resultsChunkSize).foreach(_.classList.remove("hidden"))
154154
val nextElems = entries.drop(resultsChunkSize)
@@ -192,7 +192,7 @@ class SearchbarComponent(engine: PageSearchEngine, inkuireEngine: InkuireJSSearc
192192
}
193193
}
194194

195-
def createLoadingAnimation: raw.HTMLElement =
195+
def createLoadingAnimation: HTMLElement =
196196
div(cls := "loading-wrapper")(
197197
div(cls := "loading")
198198
)
@@ -346,7 +346,7 @@ class SearchbarComponent(engine: PageSearchEngine, inkuireEngine: InkuireJSSearc
346346
val selectedElement = resultsDiv.querySelector("[selected]")
347347
if selectedElement != null then {
348348
selectedElement.removeAttribute("selected")
349-
def recur(elem: raw.Element): raw.Element = {
349+
def recur(elem: Element): Element = {
350350
val prev = elem.previousElementSibling
351351
if prev == null then null
352352
else {
@@ -366,7 +366,7 @@ class SearchbarComponent(engine: PageSearchEngine, inkuireEngine: InkuireJSSearc
366366
}
367367
private def handleArrowDown() = {
368368
val selectedElement = resultsDiv.querySelector("[selected]")
369-
def recur(elem: raw.Element): raw.Element = {
369+
def recur(elem: Element): Element = {
370370
val next = elem.nextElementSibling
371371
if next == null then null
372372
else {

scaladoc-js/main/src/searchbar/engine/InkuireJSSearchEngine.scala

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package dotty.tools.scaladoc
22

33
import scala.io.Source
44
import dotty.tools.scaladoc.PageEntry
5-
import org.scalajs.dom.webworkers.Worker
65
import org.scalajs.dom._
76
import scala.scalajs.js.{ JSON, Dynamic }
87
import scala.collection.mutable.ListBuffer

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ import scala.util.{Success,Failure}
77
import org.scalajs.dom._
88
import org.scalajs.dom.ext._
99
import scala.scalajs.js.annotation.JSExportTopLevel
10-
import org.scalajs.dom.ext.Ajax
10+
import org.scalajs.dom._
1111
import scala.scalajs.js
1212
import scala.scalajs.js.JSON
13+
import scala.scalajs.js.Thenable.Implicits.thenable2future
1314

1415
import utils.HTML._
1516

@@ -33,7 +34,7 @@ class DropdownHandler:
3334
btn.classList.add("disabled")
3435
btn.classList.add("hidden")
3536

36-
private def getURLContent(url: String): Future[String] = Ajax.get(url).map(_.responseText)
37+
private def getURLContent(url: String): Future[String] = fetch(url).flatMap(_.text())
3738

3839
window.sessionStorage.getItem(KEY) match
3940
case null => // If no key, returns null
@@ -68,7 +69,7 @@ end DropdownHandler
6869
def dropdownHandler(e: Event) =
6970
e.stopPropagation()
7071
if document.getElementById("version-dropdown").getElementsByTagName("a").size > 0 &&
71-
window.getSelection.toString.length == 0 then
72+
window.getSelection().toString.length == 0 then
7273
document.getElementById("version-dropdown").classList.toggle("expanded")
7374
document.getElementById("dropdown-trigger").classList.toggle("selected")
7475

0 commit comments

Comments
 (0)