From 8b7073145d6844193c8f2de289682afb7c2b92fe Mon Sep 17 00:00:00 2001 From: Yilin Wei Date: Mon, 17 Jul 2023 16:13:49 +0100 Subject: [PATCH 1/4] Allow File and MediaSource to be passed in to URL.createObjectURL --- api-reports/2_12.txt | 2 +- api-reports/2_13.txt | 2 +- dom/src/main/scala/org/scalajs/dom/URL.scala | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/api-reports/2_12.txt b/api-reports/2_12.txt index b9e87bf8e..494928955 100644 --- a/api-reports/2_12.txt +++ b/api-reports/2_12.txt @@ -26181,7 +26181,7 @@ URL[JC] var protocol: String URL[JC] var search: String URL[JC] var searchParams: URLSearchParams URL[JC] var username: String -URL[JO] def createObjectURL(blob: Blob): String +URL[JO] def createObjectURL(obj: Blob | File | MediaSource): String URL[JO] def revokeObjectURL(url: String): Unit URLSearchParams[JC] def append(name: String, value: String): Unit URLSearchParams[JC] def delete(name: String): Unit diff --git a/api-reports/2_13.txt b/api-reports/2_13.txt index b9e87bf8e..494928955 100644 --- a/api-reports/2_13.txt +++ b/api-reports/2_13.txt @@ -26181,7 +26181,7 @@ URL[JC] var protocol: String URL[JC] var search: String URL[JC] var searchParams: URLSearchParams URL[JC] var username: String -URL[JO] def createObjectURL(blob: Blob): String +URL[JO] def createObjectURL(obj: Blob | File | MediaSource): String URL[JO] def revokeObjectURL(url: String): Unit URLSearchParams[JC] def append(name: String, value: String): Unit URLSearchParams[JC] def delete(name: String): Unit diff --git a/dom/src/main/scala/org/scalajs/dom/URL.scala b/dom/src/main/scala/org/scalajs/dom/URL.scala index ccd0f0a7f..e3f1f380c 100644 --- a/dom/src/main/scala/org/scalajs/dom/URL.scala +++ b/dom/src/main/scala/org/scalajs/dom/URL.scala @@ -2,6 +2,7 @@ package org.scalajs.dom import scala.scalajs.js import scala.scalajs.js.annotation._ +import scala.scalajs.js.| /** The URL object provides static methods used for creating object URLs. */ @js.native @@ -16,9 +17,9 @@ object URL extends js.Object { /** The URL.createObjectURL() static method creates a DOMString containing an URL representing the object given in * parameter. The URL lifetime is tied to the document in the window on which it was created. The new object URL - * represents the specified File object or Blob object. + * represents the specified File, Blob or MediaSource object. */ - def createObjectURL(blob: Blob): String = js.native + def createObjectURL(obj: Blob | File | MediaSource): String = js.native } /** The URL() constructor returns a newly created URL object representing the URL defined by the parameters. */ From 6f822d2ff0be61f753709dd569a60da6398f308a Mon Sep 17 00:00:00 2001 From: Yilin Wei Date: Mon, 17 Jul 2023 16:38:03 +0100 Subject: [PATCH 2/4] switch over to 2 different methods --- api-reports/2_12.txt | 3 ++- api-reports/2_13.txt | 3 ++- dom/src/main/scala/org/scalajs/dom/URL.scala | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/api-reports/2_12.txt b/api-reports/2_12.txt index 494928955..94d6ebbd2 100644 --- a/api-reports/2_12.txt +++ b/api-reports/2_12.txt @@ -26181,7 +26181,8 @@ URL[JC] var protocol: String URL[JC] var search: String URL[JC] var searchParams: URLSearchParams URL[JC] var username: String -URL[JO] def createObjectURL(obj: Blob | File | MediaSource): String +URL[JO] def createObjectURL(obj: Blob): String +URL[JO] def createObjectURL(src: MediaSource): String URL[JO] def revokeObjectURL(url: String): Unit URLSearchParams[JC] def append(name: String, value: String): Unit URLSearchParams[JC] def delete(name: String): Unit diff --git a/api-reports/2_13.txt b/api-reports/2_13.txt index 494928955..94d6ebbd2 100644 --- a/api-reports/2_13.txt +++ b/api-reports/2_13.txt @@ -26181,7 +26181,8 @@ URL[JC] var protocol: String URL[JC] var search: String URL[JC] var searchParams: URLSearchParams URL[JC] var username: String -URL[JO] def createObjectURL(obj: Blob | File | MediaSource): String +URL[JO] def createObjectURL(obj: Blob): String +URL[JO] def createObjectURL(src: MediaSource): String URL[JO] def revokeObjectURL(url: String): Unit URLSearchParams[JC] def append(name: String, value: String): Unit URLSearchParams[JC] def delete(name: String): Unit diff --git a/dom/src/main/scala/org/scalajs/dom/URL.scala b/dom/src/main/scala/org/scalajs/dom/URL.scala index e3f1f380c..b7b78f72e 100644 --- a/dom/src/main/scala/org/scalajs/dom/URL.scala +++ b/dom/src/main/scala/org/scalajs/dom/URL.scala @@ -2,7 +2,6 @@ package org.scalajs.dom import scala.scalajs.js import scala.scalajs.js.annotation._ -import scala.scalajs.js.| /** The URL object provides static methods used for creating object URLs. */ @js.native @@ -19,7 +18,10 @@ object URL extends js.Object { * parameter. The URL lifetime is tied to the document in the window on which it was created. The new object URL * represents the specified File, Blob or MediaSource object. */ - def createObjectURL(obj: Blob | File | MediaSource): String = js.native + def createObjectURL(obj: Blob): String = js.native + + def createObjectURL(src: MediaSource): String = js.native + } /** The URL() constructor returns a newly created URL object representing the URL defined by the parameters. */ From 0e520f6b1e36b3204679e097be5d7095ecd18197 Mon Sep 17 00:00:00 2001 From: Yilin Wei Date: Mon, 17 Jul 2023 16:40:43 +0100 Subject: [PATCH 3/4] revert naming --- dom/src/main/scala/org/scalajs/dom/URL.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/src/main/scala/org/scalajs/dom/URL.scala b/dom/src/main/scala/org/scalajs/dom/URL.scala index b7b78f72e..aea3f3933 100644 --- a/dom/src/main/scala/org/scalajs/dom/URL.scala +++ b/dom/src/main/scala/org/scalajs/dom/URL.scala @@ -18,7 +18,7 @@ object URL extends js.Object { * parameter. The URL lifetime is tied to the document in the window on which it was created. The new object URL * represents the specified File, Blob or MediaSource object. */ - def createObjectURL(obj: Blob): String = js.native + def createObjectURL(blob: Blob): String = js.native def createObjectURL(src: MediaSource): String = js.native From 053fa1903de81c2913b4519808b475ab52c49c4c Mon Sep 17 00:00:00 2001 From: Yilin Wei Date: Mon, 17 Jul 2023 16:42:15 +0100 Subject: [PATCH 4/4] and api-docs... --- api-reports/2_12.txt | 2 +- api-reports/2_13.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api-reports/2_12.txt b/api-reports/2_12.txt index 94d6ebbd2..9d5cd5409 100644 --- a/api-reports/2_12.txt +++ b/api-reports/2_12.txt @@ -26181,7 +26181,7 @@ URL[JC] var protocol: String URL[JC] var search: String URL[JC] var searchParams: URLSearchParams URL[JC] var username: String -URL[JO] def createObjectURL(obj: Blob): String +URL[JO] def createObjectURL(blob: Blob): String URL[JO] def createObjectURL(src: MediaSource): String URL[JO] def revokeObjectURL(url: String): Unit URLSearchParams[JC] def append(name: String, value: String): Unit diff --git a/api-reports/2_13.txt b/api-reports/2_13.txt index 94d6ebbd2..9d5cd5409 100644 --- a/api-reports/2_13.txt +++ b/api-reports/2_13.txt @@ -26181,7 +26181,7 @@ URL[JC] var protocol: String URL[JC] var search: String URL[JC] var searchParams: URLSearchParams URL[JC] var username: String -URL[JO] def createObjectURL(obj: Blob): String +URL[JO] def createObjectURL(blob: Blob): String URL[JO] def createObjectURL(src: MediaSource): String URL[JO] def revokeObjectURL(url: String): Unit URLSearchParams[JC] def append(name: String, value: String): Unit