Merge branch 'master' into imageCapture

Author: armanbilge

.github/workflows/ci.yml

@@ -0,0 +1,39 @@
+name: CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        scalaversion: ["2.11.12", "2.12.12", "2.13.4", "3.0.1"]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: olafurpg/setup-scala@v10
+        with:
+          java-version: "[email protected]"
+      - uses: coursier/cache-action@v5
+      - name: Build
+        run: sbt "++${{ matrix.scalaversion }}" package
+      - name: Test generate documentation
+        run: sbt "++${{ matrix.scalaversion }}" doc
+      - name: Build examples
+        run: sbt "++${{ matrix.scalaversion }}" example/compile
+      - name: scalafmt
+        run: sbt "++${{ matrix.scalaversion }}" scalafmtCheck
+  readme:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: olafurpg/setup-scala@v10
+        with:
+          java-version: "[email protected]"
+      - uses: coursier/cache-action@v5
+      - name: Readme generation
+        run: sbt readme/run

.github/workflows/ghpages.yml

@@ -0,0 +1,27 @@
+
+name: Build and Deploy GhPages docs
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: olafurpg/setup-scala@v10
+        with:
+          java-version: "[email protected]"
+      - uses: coursier/cache-action@v5
+
+      - name: Build
+        run: sbt readme/run
+
+      - name: Deploy
+        uses: JamesIves/[email protected]
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: readme/target/scalatex

.travis.yml

@@ -5,14 +5,11 @@ lazy val root = project.in(file(".")).
 
 name := "Scala.js DOM"
 
-crossScalaVersions in ThisBuild := {
-  if (scalaJSVersion.startsWith("1.")) Seq("2.12.10", "2.11.12", "2.13.1")
-  else Seq("2.12.10", "2.11.12", "2.10.7", "2.13.1")
-}
-scalaVersion in ThisBuild := crossScalaVersions.value.head
+ThisBuild / crossScalaVersions := Seq("2.12.12", "2.11.12", "2.13.4", "3.0.1")
+ThisBuild / scalaVersion := crossScalaVersions.value.head
 
 val commonSettings = Seq(
-  version := "1.0.1-SNAPSHOT",
+  version := "2.0.0-SNAPSHOT",
   organization := "org.scala-js",
   scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings")
 )
@@ -36,7 +33,6 @@ scalacOptions ++= {
 }
 
 def hasNewCollections(version: String): Boolean = {
-  !version.startsWith("2.10.") &&
   !version.startsWith("2.11.") &&
   !version.startsWith("2.12.")
 }
@@ -104,7 +100,7 @@ lazy val readme = ScalatexReadme(
 ).settings(
   scalaVersion := "2.12.10",
   scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
-  (resources in Compile) += (fullOptJS in (example, Compile)).value.data
+  (Compile / resources) += (example / Compile / fullOptJS).value.data
 )
 
 lazy val example = project.

build.sbt

@@ -123,9 +123,8 @@ object XMLHttpRequest{
   @JSExport
   def main(pre: html.Pre) = {
     val xhr = new dom.XMLHttpRequest()
-    xhr.open("GET",
-      "http://api.openweathermap.org/" +
-      "data/2.5/weather?q=Singapore"
+    xhr.open("GET", 
+      "https://www.boredapi.com/api/activity"
     )
     xhr.onload = { (e: dom.Event) =>
       if (xhr.status == 200) {
@@ -142,7 +141,7 @@ object Websocket {
   @JSExport
   def main(in: html.Input,
            pre: html.Pre) = {
-    val echo = "ws://echo.websocket.org"
+    val echo = "wss://echo.websocket.org"
     val socket = new dom.WebSocket(echo)
     socket.onmessage = {
       (e: dom.MessageEvent) =>
@@ -167,8 +166,7 @@ object AjaxExtension {
                 .Implicits
                 .global
     val url =
-      "http://api.openweathermap.org/" +
-      "data/2.5/weather?q=Singapore"
+      "https://www.boredapi.com/api/activity"
     Ajax.get(url).foreach { case xhr =>
       pre.textContent = xhr.responseText
     }

example/src/main/scala/example/Example.scala

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.5.5

project/build.properties

@@ -1,5 +1,5 @@
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.0.0")
+  Option(System.getenv("SCALAJS_VERSION")).filter(_ != "").getOrElse("1.5.0")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
 

project/build.sbt

@@ -48,17 +48,17 @@
   @pair("Alert", Nil)
 
   @p
-    Will cause a javascript alert box saying `HAI` to appear. Other javascript classes and objects can be similarly accessed e.g. @hl.scala{new dom.XMLHttpRequest()} to perform a new Ajax request, @hl.scala{dom.document} to access the global @hl.scala{document} object, or @hl.scala{html.Div} to to refer to the type of a @hl.scala{<div>} element.
+    Will cause a javascript alert box saying `Hi from Scala-js-dom` to appear. Other javascript classes and objects can be similarly accessed e.g. @hl.scala{new dom.XMLHttpRequest()} to perform a new Ajax request, @hl.scala{dom.document} to access the global @hl.scala{document} object, or @hl.scala{html.Div} to to refer to the type of a @hl.scala{<div>} element.
 
   @sect{Usage}
     @p
       Add the following to your sbt build definition:
 
     @hl.scala
-      libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "1.0.0"
+      libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "1.1.0"
 
     @p
-      then enjoy the types available in @hl.scala{org.scalajs.dom}. scalajs-dom 1.0.0 is built and published for Scala.js 0.6.17+ and Scala.js 1.0.0+, with Scala 2.10, 2.11, 2.12 and 2.13.
+      then enjoy the types available in @hl.scala{org.scalajs.dom}. scalajs-dom 1.1.0 is built and published for Scala.js 0.6.17+ and Scala.js 1.0.0+, with Scala 2.10, 2.11, 2.12 and 2.13.
 
     @p
       To begin with, @code{scala-js-dom} organizes the full-list of DOM APIs into a number of buckets:
@@ -90,7 +90,7 @@
     @sect{Node.onmousemove}
       @pair(
        "EventHandler",
-        Seq(pre("pre")),
+        Seq(pre("Hover this box!")),
         autorun=true
       )
 

readme/Index.scalatex

@@ -930,10 +930,8 @@ object KeyFormat {
 trait RSAPublicKey extends js.Object {
 
   /* modulus, as a base64 URL encoded String */
-  @js.native
   def n: String = js.native
 
   /* exponent, as a base64 URL encoded String */
-  @js.native
   def e: String = js.native
 }

src/main/scala/org/scalajs/dom/crypto/Crypto.scala

@@ -123,12 +123,12 @@ object CollatorOptions {
   ): CollatorOptions = {
     js.Dynamic
       .literal(
-          localeMatcher = localeMatcher,
-          usage = usage,
-          sensitivity = sensitivity,
-          ignorePunctuation = ignorePunctuation,
-          numeric = numeric,
-          caseFirst = caseFirst
+          localeMatcher = localeMatcher.asInstanceOf[js.Any],
+          usage = usage.asInstanceOf[js.Any],
+          sensitivity = sensitivity.asInstanceOf[js.Any],
+          ignorePunctuation = ignorePunctuation.asInstanceOf[js.Any],
+          numeric = numeric.asInstanceOf[js.Any],
+          caseFirst = caseFirst.asInstanceOf[js.Any]
       )
       .asInstanceOf[CollatorOptions]
   }
@@ -200,19 +200,19 @@ object DateTimeFormatOptions {
     // format: off
     js.Dynamic
       .literal(
-          localeMatcher = localeMatcher,
-          timeZone = timeZone,
-          hour12 = hour12,
-          formatMatcher = formatMatcher,
-          weekday = weekday,
-          era = era,
-          year = year,
-          month = month,
-          day = day,
-          hour = hour,
-          minute = minute,
-          second = second,
-          timeZoneName = timeZoneName
+          localeMatcher = localeMatcher.asInstanceOf[js.Any],
+          timeZone = timeZone.asInstanceOf[js.Any],
+          hour12 = hour12.asInstanceOf[js.Any],
+          formatMatcher = formatMatcher.asInstanceOf[js.Any],
+          weekday = weekday.asInstanceOf[js.Any],
+          era = era.asInstanceOf[js.Any],
+          year = year.asInstanceOf[js.Any],
+          month = month.asInstanceOf[js.Any],
+          day = day.asInstanceOf[js.Any],
+          hour = hour.asInstanceOf[js.Any],
+          minute = minute.asInstanceOf[js.Any],
+          second = second.asInstanceOf[js.Any],
+          timeZoneName = timeZoneName.asInstanceOf[js.Any]
       )
       .asInstanceOf[DateTimeFormatOptions]
     // format: on
@@ -300,16 +300,16 @@ object NumberFormatOptions {
   ): NumberFormatOptions = {
     js.Dynamic
       .literal(
-          localeMatcher = localeMatcher,
-          style = style,
-          currency = currency,
-          currencyDisplay = currencyDisplay,
-          useGrouping = useGrouping,
-          minimumIntegerDigits = minimumIntegerDigits,
-          minimumFractionDigits = minimumFractionDigits,
-          maximumFractionDigits = maximumFractionDigits,
-          minimumSignificantDigits = minimumSignificantDigits,
-          maximumSignificantDigits = maximumSignificantDigits
+          localeMatcher = localeMatcher.asInstanceOf[js.Any],
+          style = style.asInstanceOf[js.Any],
+          currency = currency.asInstanceOf[js.Any],
+          currencyDisplay = currencyDisplay.asInstanceOf[js.Any],
+          useGrouping = useGrouping.asInstanceOf[js.Any],
+          minimumIntegerDigits = minimumIntegerDigits.asInstanceOf[js.Any],
+          minimumFractionDigits = minimumFractionDigits.asInstanceOf[js.Any],
+          maximumFractionDigits = maximumFractionDigits.asInstanceOf[js.Any],
+          minimumSignificantDigits = minimumSignificantDigits.asInstanceOf[js.Any],
+          maximumSignificantDigits = maximumSignificantDigits.asInstanceOf[js.Any]
       )
       .asInstanceOf[NumberFormatOptions]
   }

src/main/scala/org/scalajs/dom/experimental/intl/Intl.scala

@@ -44,7 +44,7 @@ trait SharedWorkerGlobalScope extends WorkerGlobalScope {
    *
    * MDN
    */
-  var onconnect: Function1[ExtendableMessageEvent, _] = js.native
+  var onconnect: js.Function1[ExtendableMessageEvent, _] = js.native
 }
 
 @js.native

src/main/scala/org/scalajs/dom/experimental/sharedworkers/SharedWorkerGlobalScope.scala

@@ -243,6 +243,12 @@ object Ajax {
     apply("PUT", url, data, timeout, headers, withCredentials, responseType)
   }
 
+  def patch(url: String, data: InputData = null, timeout: Int = 0,
+      headers: Map[String, String] = Map.empty,
+      withCredentials: Boolean = false, responseType: String = "") = {
+    apply("PATCH", url, data, timeout, headers, withCredentials, responseType)
+  }
+
   def delete(url: String, data: InputData = null, timeout: Int = 0,
       headers: Map[String, String] = Map.empty,
       withCredentials: Boolean = false, responseType: String = "") = {

src/main/scala/org/scalajs/dom/ext/Extensions.scala

@@ -22,17 +22,20 @@ package object ext {
     def cast[T] = x.asInstanceOf[T]
   }
 
-  implicit def pimpAnimatedNumber(x: svg.AnimatedNumber) = x.baseVal
+  implicit def pimpAnimatedNumber(x: svg.AnimatedNumber): Double = x.baseVal
 
-  implicit def pimpRichAnimatedNumber(x: svg.AnimatedNumber) =
+  implicit def pimpRichAnimatedNumber(
+      x: svg.AnimatedNumber): runtime.RichDouble =
     x.baseVal: runtime.RichDouble
 
-  implicit def pimpAnimatedLength(x: svg.AnimatedLength) = x.baseVal.value
+  implicit def pimpAnimatedLength(x: svg.AnimatedLength): Double =
+    x.baseVal.value
 
-  implicit def pimpRichAnimatedLength(x: svg.AnimatedLength) =
+  implicit def pimpRichAnimatedLength(
+      x: svg.AnimatedLength): runtime.RichDouble =
     x.baseVal.value: runtime.RichDouble
 
-  implicit def color2String(c: Color) = c.toString
+  implicit def color2String(c: Color): String = c.toString
   implicit class pimpedContext(val ctx: CanvasRenderingContext2D) {
     def prepCircle(x: Double, y: Double, r: Double) = {
       ctx.beginPath()

src/main/scala/org/scalajs/dom/ext/package.scala

@@ -219,5 +219,5 @@ package object dom {
   lazy val window: Window = js.Dynamic.global.window.asInstanceOf[Window]
   lazy val document: html.Document = window.document
 
-  lazy val console: Console = window.console
+  lazy val console: Console = js.Dynamic.global.console.asInstanceOf[Console] // #411
 }

src/main/scala/org/scalajs/dom/package.scala

@@ -2566,6 +2566,8 @@ class Window
    */
   def close(): Unit = js.native
 
+  def closed: Boolean = js.native
+
   /**
    * The window.postMessage method safely enables cross-origin communication.
    * Normally, scripts on different pages are allowed to access each other if and only if
@@ -5677,7 +5679,7 @@ class StyleSheetList extends js.Object {
 }
 
 trait CustomEventInit extends EventInit {
-  var detailArg: js.UndefOr[Any] = js.undefined
+  var detail: js.UndefOr[Any] = js.undefined
 }
 
 /**