Skip to content

Commit db25ead

Browse files
japgollyjapgolly
authored
Merge pull request #572 from scala-js/topic/migrate-storage
Migrate storage to dom
2 parents 3b38146 + 0b68faf commit db25ead

File tree

5 files changed

+51
-48
lines changed

5 files changed

+51
-48
lines changed

‎api-reports/2_12.txt

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14408,6 +14408,7 @@ Navigator[JC] def languages: js.Array[String]
1440814408
Navigator[JC] def onLine: Boolean
1440914409
Navigator[JC] def platform: String
1441014410
Navigator[JC] def sendBeacon(url: String, data: BodyInit?): Boolean
14411+
Navigator[JC] def storage: StorageManager
1441114412
Navigator[JC] def userAgent: String
1441214413
Navigator[JC] def vibrate(duration: Double): Boolean
1441314414
Navigator[JC] def vibrate(pattern: js.Array[Double]): Boolean
@@ -22921,6 +22922,8 @@ Storage[JC] def key(index: Int): String
2292122922
Storage[JC] var length: Int
2292222923
Storage[JC] def removeItem(key: String): Unit
2292322924
Storage[JC] def setItem(key: String, data: String): Unit
22925+
StorageEstimate[JT] val quota: Double
22926+
StorageEstimate[JT] val usage: Double
2292422927
StorageEvent[JC] def bubbles: Boolean
2292522928
StorageEvent[JC] def cancelBubble: Boolean
2292622929
StorageEvent[JC] def cancelable: Boolean
@@ -22948,6 +22951,9 @@ StorageEventInit[JT] var oldValue: js.UndefOr[String]
2294822951
StorageEventInit[JT] var scoped: js.UndefOr[Boolean]
2294922952
StorageEventInit[JT] var storageArea: js.UndefOr[Storage]
2295022953
StorageEventInit[JT] var url: js.UndefOr[String]
22954+
StorageManager[JT] def estimate(): js.Promise[StorageEstimate]
22955+
StorageManager[JT] def persist(): js.Promise[Boolean]
22956+
StorageManager[JT] def persisted(): js.Promise[Boolean]
2295122957
StyleMedia[JT] def matchMedium(mediaquery: String): Boolean
2295222958
StyleMedia[JT] def `type`: String
2295322959
StyleSheet[JC] def disabled: Boolean
@@ -25154,19 +25160,10 @@ experimental/sharedworkers/SharedWorkerGlobalScope[JT] def removeEventListener[T
2515425160
experimental/sharedworkers/SharedWorkerGlobalScope[JT] def self: this.type
2515525161
experimental/sharedworkers/SharedWorkerGlobalScope[JT] def setInterval(handler: js.Function0[Any], timeout: Double): Int
2515625162
experimental/sharedworkers/SharedWorkerGlobalScope[JT] def setTimeout(handler: js.Function0[Any], timeout: Double): Int
25157-
experimental/storage/package[SO] def estimate(): js.Promise[StorageEstimate]
25158-
experimental/storage/package[SO] def persist(): js.Promise[Boolean]
25159-
experimental/storage/package[SO] def persisted(): js.Promise[Boolean]
25160-
experimental/storage/package[SO] val quota: Double
25161-
experimental/storage/package[SO] val storage: StorageManager
25162-
experimental/storage/package[SO] implicit def toNavigatorStorage(navigator: dom.Navigator): NavigatorStorage
25163-
experimental/storage/package[SO] val usage: Double
25164-
experimental/storage/package.NavigatorStorage[JT] val storage: StorageManager
25165-
experimental/storage/package.StorageEstimate[JT] val quota: Double
25166-
experimental/storage/package.StorageEstimate[JT] val usage: Double
25167-
experimental/storage/package.StorageManager[JT] def estimate(): js.Promise[StorageEstimate]
25168-
experimental/storage/package.StorageManager[JT] def persist(): js.Promise[Boolean]
25169-
experimental/storage/package.StorageManager[JT] def persisted(): js.Promise[Boolean]
25163+
experimental/storage/package[SO] type NavigatorStorage = dom.Navigator (@deprecated in 2.0.0)
25164+
experimental/storage/package[SO] type StorageEstimate = dom.StorageEstimate (@deprecated in 2.0.0)
25165+
experimental/storage/package[SO] type StorageManager = dom.StorageManager (@deprecated in 2.0.0)
25166+
experimental/storage/package[SO] def toNavigatorStorage(navigator: dom.Navigator): dom.Navigator (@deprecated in 2.0.0)
2517025167
experimental/webgl/ANGLE_instanced_arrays[SO]
2517125168
experimental/webgl/EXT_blend_minmax[SO]
2517225169
experimental/webgl/EXT_color_buffer_half_float[SO]

‎api-reports/2_13.txt

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14408,6 +14408,7 @@ Navigator[JC] def languages: js.Array[String]
1440814408
Navigator[JC] def onLine: Boolean
1440914409
Navigator[JC] def platform: String
1441014410
Navigator[JC] def sendBeacon(url: String, data: BodyInit?): Boolean
14411+
Navigator[JC] def storage: StorageManager
1441114412
Navigator[JC] def userAgent: String
1441214413
Navigator[JC] def vibrate(duration: Double): Boolean
1441314414
Navigator[JC] def vibrate(pattern: js.Array[Double]): Boolean
@@ -22921,6 +22922,8 @@ Storage[JC] def key(index: Int): String
2292122922
Storage[JC] var length: Int
2292222923
Storage[JC] def removeItem(key: String): Unit
2292322924
Storage[JC] def setItem(key: String, data: String): Unit
22925+
StorageEstimate[JT] val quota: Double
22926+
StorageEstimate[JT] val usage: Double
2292422927
StorageEvent[JC] def bubbles: Boolean
2292522928
StorageEvent[JC] def cancelBubble: Boolean
2292622929
StorageEvent[JC] def cancelable: Boolean
@@ -22948,6 +22951,9 @@ StorageEventInit[JT] var oldValue: js.UndefOr[String]
2294822951
StorageEventInit[JT] var scoped: js.UndefOr[Boolean]
2294922952
StorageEventInit[JT] var storageArea: js.UndefOr[Storage]
2295022953
StorageEventInit[JT] var url: js.UndefOr[String]
22954+
StorageManager[JT] def estimate(): js.Promise[StorageEstimate]
22955+
StorageManager[JT] def persist(): js.Promise[Boolean]
22956+
StorageManager[JT] def persisted(): js.Promise[Boolean]
2295122957
StyleMedia[JT] def matchMedium(mediaquery: String): Boolean
2295222958
StyleMedia[JT] def `type`: String
2295322959
StyleSheet[JC] def disabled: Boolean
@@ -25154,19 +25160,10 @@ experimental/sharedworkers/SharedWorkerGlobalScope[JT] def removeEventListener[T
2515425160
experimental/sharedworkers/SharedWorkerGlobalScope[JT] def self: this.type
2515525161
experimental/sharedworkers/SharedWorkerGlobalScope[JT] def setInterval(handler: js.Function0[Any], timeout: Double): Int
2515625162
experimental/sharedworkers/SharedWorkerGlobalScope[JT] def setTimeout(handler: js.Function0[Any], timeout: Double): Int
25157-
experimental/storage/package[SO] def estimate(): js.Promise[StorageEstimate]
25158-
experimental/storage/package[SO] def persist(): js.Promise[Boolean]
25159-
experimental/storage/package[SO] def persisted(): js.Promise[Boolean]
25160-
experimental/storage/package[SO] val quota: Double
25161-
experimental/storage/package[SO] val storage: StorageManager
25162-
experimental/storage/package[SO] implicit def toNavigatorStorage(navigator: dom.Navigator): NavigatorStorage
25163-
experimental/storage/package[SO] val usage: Double
25164-
experimental/storage/package.NavigatorStorage[JT] val storage: StorageManager
25165-
experimental/storage/package.StorageEstimate[JT] val quota: Double
25166-
experimental/storage/package.StorageEstimate[JT] val usage: Double
25167-
experimental/storage/package.StorageManager[JT] def estimate(): js.Promise[StorageEstimate]
25168-
experimental/storage/package.StorageManager[JT] def persist(): js.Promise[Boolean]
25169-
experimental/storage/package.StorageManager[JT] def persisted(): js.Promise[Boolean]
25163+
experimental/storage/package[SO] type NavigatorStorage = dom.Navigator (@deprecated in 2.0.0)
25164+
experimental/storage/package[SO] type StorageEstimate = dom.StorageEstimate (@deprecated in 2.0.0)
25165+
experimental/storage/package[SO] type StorageManager = dom.StorageManager (@deprecated in 2.0.0)
25166+
experimental/storage/package[SO] def toNavigatorStorage(navigator: dom.Navigator): dom.Navigator (@deprecated in 2.0.0)
2517025167
experimental/webgl/ANGLE_instanced_arrays[SO]
2517125168
experimental/webgl/EXT_blend_minmax[SO]
2517225169
experimental/webgl/EXT_color_buffer_half_float[SO]

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

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,20 @@
1-
package org.scalajs.dom.experimental
2-
3-
import org.scalajs.dom
4-
import scala.language.implicitConversions
5-
import scala.scalajs.js
1+
package org.scalajs
2+
package dom.experimental
63

74
/** https://storage.spec.whatwg.org/ */
85
package object storage {
96

10-
implicit def toNavigatorStorage(navigator: dom.Navigator): NavigatorStorage =
11-
navigator.asInstanceOf[NavigatorStorage]
7+
@deprecated("use dom.Navigator directly instead", "2.0.0")
8+
def toNavigatorStorage(navigator: dom.Navigator): dom.Navigator =
9+
navigator
10+
11+
@deprecated("use dom.Navigator directly instead", "2.0.0")
12+
type NavigatorStorage = dom.Navigator
1213

13-
@js.native
14-
trait NavigatorStorage extends js.Object {
15-
val storage: StorageManager = js.native
16-
}
14+
@deprecated("use dom.StorageManager instead", "2.0.0")
15+
type StorageManager = dom.StorageManager
1716

18-
@js.native
19-
trait StorageManager extends js.Any {
20-
def persisted(): js.Promise[Boolean] = js.native
21-
def persist(): js.Promise[Boolean] = js.native
22-
def estimate(): js.Promise[StorageEstimate] = js.native
23-
}
17+
@deprecated("use dom.StorageEstimate instead", "2.0.0")
18+
type StorageEstimate = dom.StorageEstimate
2419

25-
@js.native
26-
trait StorageEstimate extends js.Any {
27-
val usage: Double = js.native
28-
val quota: Double = js.native
29-
}
3020
}

‎src/main/scala/org/scalajs/dom/lib.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,9 @@ class Navigator
326326
*/
327327
def sendBeacon(url: String, data: BodyInit = js.native): Boolean = js.native
328328

329+
/** https://storage.spec.whatwg.org/ */
330+
def storage: StorageManager = js.native
331+
329332
/** Implements the Gamepad API.
330333
*
331334
* [[https://www.w3.org/TR/2015/WD-gamepad-20151217/ W3C Working Draft]]

‎src/main/scala/org/scalajs/dom/storage.scala

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package org.scalajs.dom
2+
3+
import scala.scalajs.js
4+
5+
@js.native
6+
trait StorageManager extends js.Object {
7+
def persisted(): js.Promise[Boolean] = js.native
8+
def persist(): js.Promise[Boolean] = js.native
9+
def estimate(): js.Promise[StorageEstimate] = js.native
10+
}
11+
12+
@js.native
13+
trait StorageEstimate extends js.Object {
14+
val usage: Double = js.native
15+
val quota: Double = js.native
16+
}

0 commit comments

Comments
 (0)