Skip to content

Commit 337dfb8

Browse files
authored
Merge pull request #576 from scala-js/topic/migrate-filereadersync
Migrate FileReaderSync to dom
2 parents 251145e + 664a275 commit 337dfb8

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

api-reports/2_12.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1665,6 +1665,9 @@ FileReader[JC] def result: js.Any
16651665
FileReader[JO] val DONE: Short
16661666
FileReader[JO] val EMPTY: Short
16671667
FileReader[JO] val LOADING: Short
1668+
FileReaderSync[JC] def readAsArrayBuffer(blob: Blob): ArrayBuffer
1669+
FileReaderSync[JC] def readAsDataURL(blob: Blob): URL
1670+
FileReaderSync[JC] def readAsText(blob: Blob, encoding: String?): String
16681671
FocusEvent[JC] def bubbles: Boolean
16691672
FocusEvent[JC] def cancelBubble: Boolean
16701673
FocusEvent[JC] def cancelable: Boolean
@@ -24399,9 +24402,6 @@ crypto/package[SO] type BigInteger = Uint8Array
2439924402
crypto/package[SO] type HashAlgorithmIdentifier = HashAlgorithm | String
2440024403
crypto/package[SO] type KeyAlgorithmIdentifier = KeyAlgorithm | String
2440124404
crypto/package[SO] @js.native @JSGlobal("crypto") val crypto: Crypto
24402-
experimental/FileReaderSync[JC] def readAsArrayBuffer(blob: Blob): ArrayBuffer
24403-
experimental/FileReaderSync[JC] def readAsDataURL(blob: Blob): dom.URL
24404-
experimental/FileReaderSync[JC] def readAsText(blob: Blob, encoding: String?): String
2440524405
experimental/Fullscreen[SO] (@deprecated in 2.0.0)
2440624406
experimental/PointerLock[SO] def exitPointerLock(): Unit
2440724407
experimental/PointerLock[SO] def movementX: Double
@@ -24811,6 +24811,7 @@ experimental/package[SO] type Body = dom.Body (@deprecated in 2.0.0)
2481124811
experimental/package[SO] type BodyInit = dom.BodyInit (@deprecated in 2.0.0)
2481224812
experimental/package[SO] type ByteString = dom.ByteString (@deprecated in 2.0.0)
2481324813
experimental/package[SO] type Chunk[+T] = dom.Chunk[T] (@deprecated in 2.0.0)
24814+
experimental/package[SO] type FileReaderSync = dom.FileReaderSync (@deprecated in 2.0.0)
2481424815
experimental/package[SO] type Headers = dom.Headers (@deprecated in 2.0.0)
2481524816
experimental/package[SO] type HeadersInit = dom.HeadersInit (@deprecated in 2.0.0)
2481624817
experimental/package[SO] type HttpMethod = dom.HttpMethod (@deprecated in 2.0.0)

api-reports/2_13.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1665,6 +1665,9 @@ FileReader[JC] def result: js.Any
16651665
FileReader[JO] val DONE: Short
16661666
FileReader[JO] val EMPTY: Short
16671667
FileReader[JO] val LOADING: Short
1668+
FileReaderSync[JC] def readAsArrayBuffer(blob: Blob): ArrayBuffer
1669+
FileReaderSync[JC] def readAsDataURL(blob: Blob): URL
1670+
FileReaderSync[JC] def readAsText(blob: Blob, encoding: String?): String
16681671
FocusEvent[JC] def bubbles: Boolean
16691672
FocusEvent[JC] def cancelBubble: Boolean
16701673
FocusEvent[JC] def cancelable: Boolean
@@ -24399,9 +24402,6 @@ crypto/package[SO] type BigInteger = Uint8Array
2439924402
crypto/package[SO] type HashAlgorithmIdentifier = HashAlgorithm | String
2440024403
crypto/package[SO] type KeyAlgorithmIdentifier = KeyAlgorithm | String
2440124404
crypto/package[SO] @js.native @JSGlobal("crypto") val crypto: Crypto
24402-
experimental/FileReaderSync[JC] def readAsArrayBuffer(blob: Blob): ArrayBuffer
24403-
experimental/FileReaderSync[JC] def readAsDataURL(blob: Blob): dom.URL
24404-
experimental/FileReaderSync[JC] def readAsText(blob: Blob, encoding: String?): String
2440524405
experimental/Fullscreen[SO] (@deprecated in 2.0.0)
2440624406
experimental/PointerLock[SO] def exitPointerLock(): Unit
2440724407
experimental/PointerLock[SO] def movementX: Double
@@ -24811,6 +24811,7 @@ experimental/package[SO] type Body = dom.Body (@deprecated in 2.0.0)
2481124811
experimental/package[SO] type BodyInit = dom.BodyInit (@deprecated in 2.0.0)
2481224812
experimental/package[SO] type ByteString = dom.ByteString (@deprecated in 2.0.0)
2481324813
experimental/package[SO] type Chunk[+T] = dom.Chunk[T] (@deprecated in 2.0.0)
24814+
experimental/package[SO] type FileReaderSync = dom.FileReaderSync (@deprecated in 2.0.0)
2481424815
experimental/package[SO] type Headers = dom.Headers (@deprecated in 2.0.0)
2481524816
experimental/package[SO] type HeadersInit = dom.HeadersInit (@deprecated in 2.0.0)
2481624817
experimental/package[SO] type HttpMethod = dom.HttpMethod (@deprecated in 2.0.0)

src/main/scala/org/scalajs/dom/experimental/FileReaderSync.scala renamed to src/main/scala/org/scalajs/dom/FileReaderSync.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
package org.scalajs.dom.experimental
1+
package org.scalajs.dom
22

3-
import org.scalajs.dom
4-
import org.scalajs.dom.Blob
53
import scala.scalajs.js
64
import scala.scalajs.js.annotation._
75
import scala.scalajs.js.typedarray.ArrayBuffer
@@ -24,7 +22,7 @@ class FileReaderSync() extends js.Object {
2422
* operation is finished, the readyState becomes DONE, and the loadend is triggered. At that time, the result
2523
* attribute contains a data: URL representing the file's data as base64 encoded string.
2624
*/
27-
def readAsDataURL(blob: Blob): dom.URL = js.native
25+
def readAsDataURL(blob: Blob): URL = js.native
2826

2927
/** The readAsText method is used to read the contents of the specified Blob or File. When the read operation is
3028
* complete, the readyState is changed to DONE, the loadend is triggered, and the result attribute contains the

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ package object experimental {
134134
@deprecated("use dom.ResponseType instead", "2.0.0")
135135
lazy val ResponseType: dom.ResponseType.type = dom.ResponseType
136136

137+
// old FileReaderSync.scala
138+
@deprecated("use dom.FileReaderSync instead", "2.0.0")
139+
type FileReaderSync = dom.FileReaderSync
140+
137141
// old Notification.scala
138142

139143
@deprecated("use dom.Notification instead", "2.0.0")

0 commit comments

Comments
 (0)