From 664a2753dec2acd775008b66ddbba4222f18f546 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Thu, 9 Sep 2021 01:24:15 +0000 Subject: [PATCH] Migrate FileReaderSync to dom --- api-reports/2_12.txt | 7 ++++--- api-reports/2_13.txt | 7 ++++--- .../scalajs/dom/{experimental => }/FileReaderSync.scala | 6 ++---- src/main/scala/org/scalajs/dom/experimental/package.scala | 4 ++++ 4 files changed, 14 insertions(+), 10 deletions(-) rename src/main/scala/org/scalajs/dom/{experimental => }/FileReaderSync.scala (91%) diff --git a/api-reports/2_12.txt b/api-reports/2_12.txt index 303a14fb1..c6c8e7069 100644 --- a/api-reports/2_12.txt +++ b/api-reports/2_12.txt @@ -1665,6 +1665,9 @@ FileReader[JC] def result: js.Any FileReader[JO] val DONE: Short FileReader[JO] val EMPTY: Short FileReader[JO] val LOADING: Short +FileReaderSync[JC] def readAsArrayBuffer(blob: Blob): ArrayBuffer +FileReaderSync[JC] def readAsDataURL(blob: Blob): URL +FileReaderSync[JC] def readAsText(blob: Blob, encoding: String?): String FocusEvent[JC] def bubbles: Boolean FocusEvent[JC] def cancelBubble: Boolean FocusEvent[JC] def cancelable: Boolean @@ -24399,9 +24402,6 @@ crypto/package[SO] type BigInteger = Uint8Array crypto/package[SO] type HashAlgorithmIdentifier = HashAlgorithm | String crypto/package[SO] type KeyAlgorithmIdentifier = KeyAlgorithm | String crypto/package[SO] @js.native @JSGlobal("crypto") val crypto: Crypto -experimental/FileReaderSync[JC] def readAsArrayBuffer(blob: Blob): ArrayBuffer -experimental/FileReaderSync[JC] def readAsDataURL(blob: Blob): dom.URL -experimental/FileReaderSync[JC] def readAsText(blob: Blob, encoding: String?): String experimental/Fullscreen[SO] (@deprecated in 2.0.0) experimental/PointerLock[SO] def exitPointerLock(): Unit experimental/PointerLock[SO] def movementX: Double @@ -24811,6 +24811,7 @@ experimental/package[SO] type Body = dom.Body (@deprecated in 2.0.0) experimental/package[SO] type BodyInit = dom.BodyInit (@deprecated in 2.0.0) experimental/package[SO] type ByteString = dom.ByteString (@deprecated in 2.0.0) experimental/package[SO] type Chunk[+T] = dom.Chunk[T] (@deprecated in 2.0.0) +experimental/package[SO] type FileReaderSync = dom.FileReaderSync (@deprecated in 2.0.0) experimental/package[SO] type Headers = dom.Headers (@deprecated in 2.0.0) experimental/package[SO] type HeadersInit = dom.HeadersInit (@deprecated in 2.0.0) experimental/package[SO] type HttpMethod = dom.HttpMethod (@deprecated in 2.0.0) diff --git a/api-reports/2_13.txt b/api-reports/2_13.txt index 303a14fb1..c6c8e7069 100644 --- a/api-reports/2_13.txt +++ b/api-reports/2_13.txt @@ -1665,6 +1665,9 @@ FileReader[JC] def result: js.Any FileReader[JO] val DONE: Short FileReader[JO] val EMPTY: Short FileReader[JO] val LOADING: Short +FileReaderSync[JC] def readAsArrayBuffer(blob: Blob): ArrayBuffer +FileReaderSync[JC] def readAsDataURL(blob: Blob): URL +FileReaderSync[JC] def readAsText(blob: Blob, encoding: String?): String FocusEvent[JC] def bubbles: Boolean FocusEvent[JC] def cancelBubble: Boolean FocusEvent[JC] def cancelable: Boolean @@ -24399,9 +24402,6 @@ crypto/package[SO] type BigInteger = Uint8Array crypto/package[SO] type HashAlgorithmIdentifier = HashAlgorithm | String crypto/package[SO] type KeyAlgorithmIdentifier = KeyAlgorithm | String crypto/package[SO] @js.native @JSGlobal("crypto") val crypto: Crypto -experimental/FileReaderSync[JC] def readAsArrayBuffer(blob: Blob): ArrayBuffer -experimental/FileReaderSync[JC] def readAsDataURL(blob: Blob): dom.URL -experimental/FileReaderSync[JC] def readAsText(blob: Blob, encoding: String?): String experimental/Fullscreen[SO] (@deprecated in 2.0.0) experimental/PointerLock[SO] def exitPointerLock(): Unit experimental/PointerLock[SO] def movementX: Double @@ -24811,6 +24811,7 @@ experimental/package[SO] type Body = dom.Body (@deprecated in 2.0.0) experimental/package[SO] type BodyInit = dom.BodyInit (@deprecated in 2.0.0) experimental/package[SO] type ByteString = dom.ByteString (@deprecated in 2.0.0) experimental/package[SO] type Chunk[+T] = dom.Chunk[T] (@deprecated in 2.0.0) +experimental/package[SO] type FileReaderSync = dom.FileReaderSync (@deprecated in 2.0.0) experimental/package[SO] type Headers = dom.Headers (@deprecated in 2.0.0) experimental/package[SO] type HeadersInit = dom.HeadersInit (@deprecated in 2.0.0) experimental/package[SO] type HttpMethod = dom.HttpMethod (@deprecated in 2.0.0) diff --git a/src/main/scala/org/scalajs/dom/experimental/FileReaderSync.scala b/src/main/scala/org/scalajs/dom/FileReaderSync.scala similarity index 91% rename from src/main/scala/org/scalajs/dom/experimental/FileReaderSync.scala rename to src/main/scala/org/scalajs/dom/FileReaderSync.scala index c3d1fdd26..c5a3e1eff 100644 --- a/src/main/scala/org/scalajs/dom/experimental/FileReaderSync.scala +++ b/src/main/scala/org/scalajs/dom/FileReaderSync.scala @@ -1,7 +1,5 @@ -package org.scalajs.dom.experimental +package org.scalajs.dom -import org.scalajs.dom -import org.scalajs.dom.Blob import scala.scalajs.js import scala.scalajs.js.annotation._ import scala.scalajs.js.typedarray.ArrayBuffer @@ -24,7 +22,7 @@ class FileReaderSync() extends js.Object { * operation is finished, the readyState becomes DONE, and the loadend is triggered. At that time, the result * attribute contains a data: URL representing the file's data as base64 encoded string. */ - def readAsDataURL(blob: Blob): dom.URL = js.native + def readAsDataURL(blob: Blob): URL = js.native /** The readAsText method is used to read the contents of the specified Blob or File. When the read operation is * complete, the readyState is changed to DONE, the loadend is triggered, and the result attribute contains the diff --git a/src/main/scala/org/scalajs/dom/experimental/package.scala b/src/main/scala/org/scalajs/dom/experimental/package.scala index 7f2c53ae9..0c1a4adfa 100644 --- a/src/main/scala/org/scalajs/dom/experimental/package.scala +++ b/src/main/scala/org/scalajs/dom/experimental/package.scala @@ -134,6 +134,10 @@ package object experimental { @deprecated("use dom.ResponseType instead", "2.0.0") lazy val ResponseType: dom.ResponseType.type = dom.ResponseType + // old FileReaderSync.scala + @deprecated("use dom.FileReaderSync instead", "2.0.0") + type FileReaderSync = dom.FileReaderSync + // old Notification.scala @deprecated("use dom.Notification instead", "2.0.0")