Skip to content

Commit 95127c2

Browse files
committed
Change naming of dropEffect and effectAllowed return types
1 parent 5a67f9f commit 95127c2

11 files changed

+96
-96
lines changed

Diff for: api-reports/2_12.txt

+17-17
Original file line numberDiff line numberDiff line change
@@ -1297,14 +1297,29 @@ DOMTokenList[JC] def remove(token: String): Unit
12971297
DOMTokenList[JC] def toggle(token: String): Boolean
12981298
DOMTokenList[JC] def toggle(token: String, force: Boolean): Boolean
12991299
DataTransfer[JT] def clearData(format: String?): Unit
1300-
DataTransfer[JT] var dropEffect: DropEffectValue
1301-
DataTransfer[JT] var effectAllowed: EffectAllowedValue
1300+
DataTransfer[JT] var dropEffect: DataTransferDropEffectKind
1301+
DataTransfer[JT] var effectAllowed: DataTransferEffectAllowedKind
13021302
DataTransfer[JT] def files: FileList
13031303
DataTransfer[JT] def getData(format: String): String
13041304
DataTransfer[JT] def items: DataTransferItemList
13051305
DataTransfer[JT] def setData(format: String, data: String): Unit
13061306
DataTransfer[JT] def setDragImage(image: Element, x: Double, y: Double): Unit
13071307
DataTransfer[JT] def types: FrozenArray[String]
1308+
DataTransferDropEffectKind[JT]
1309+
DataTransferDropEffectKind[SO] val copy: DataTransferDropEffectKind
1310+
DataTransferDropEffectKind[SO] val link: DataTransferDropEffectKind
1311+
DataTransferDropEffectKind[SO] val move: DataTransferDropEffectKind
1312+
DataTransferDropEffectKind[SO] val none: DataTransferDropEffectKind
1313+
DataTransferEffectAllowedKind[JT]
1314+
DataTransferEffectAllowedKind[SO] val all: DataTransferEffectAllowedKind
1315+
DataTransferEffectAllowedKind[SO] val copy: DataTransferEffectAllowedKind
1316+
DataTransferEffectAllowedKind[SO] val copyLink: DataTransferEffectAllowedKind
1317+
DataTransferEffectAllowedKind[SO] val copyMove: DataTransferEffectAllowedKind
1318+
DataTransferEffectAllowedKind[SO] val link: DataTransferEffectAllowedKind
1319+
DataTransferEffectAllowedKind[SO] val linkMove: DataTransferEffectAllowedKind
1320+
DataTransferEffectAllowedKind[SO] val move: DataTransferEffectAllowedKind
1321+
DataTransferEffectAllowedKind[SO] val none: DataTransferEffectAllowedKind
1322+
DataTransferEffectAllowedKind[SO] val uninitialized: DataTransferEffectAllowedKind
13081323
DataTransferItem[JC] def getAsFile(): File
13091324
DataTransferItem[JC] def getAsString(callback: js.Function1[String, Unit]): Unit
13101325
DataTransferItem[JC] def kind: DragDataItemKind
@@ -1680,11 +1695,6 @@ DragEvent[JT] def target: EventTarget
16801695
DragEvent[JT] def timeStamp: Double
16811696
DragEvent[JT] def `type`: String
16821697
DragEvent[JT] def view: Window
1683-
DropEffectValue[JT]
1684-
DropEffectValue[SO] val copy: DropEffectValue
1685-
DropEffectValue[SO] val link: DropEffectValue
1686-
DropEffectValue[SO] val move: DropEffectValue
1687-
DropEffectValue[SO] val none: DropEffectValue
16881698
DynamicsCompressorNode[JT] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit
16891699
DynamicsCompressorNode[JT] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit
16901700
DynamicsCompressorNode[JT] val attack: AudioParam
@@ -1730,16 +1740,6 @@ EcdsaParams[JT] val name: String
17301740
EcdsaParams[SO] def apply(name: String, hash: HashAlgorithmIdentifier): EcdsaParams (@deprecated in 2.0.0)
17311741
EcdsaParams[SO] val hash = hash0
17321742
EcdsaParams[SO] val name = name0
1733-
EffectAllowedValue[JT]
1734-
EffectAllowedValue[SO] val all: EffectAllowedValue
1735-
EffectAllowedValue[SO] val copy: EffectAllowedValue
1736-
EffectAllowedValue[SO] val copyLink: EffectAllowedValue
1737-
EffectAllowedValue[SO] val copyMove: EffectAllowedValue
1738-
EffectAllowedValue[SO] val link: EffectAllowedValue
1739-
EffectAllowedValue[SO] val linkMove: EffectAllowedValue
1740-
EffectAllowedValue[SO] val move: EffectAllowedValue
1741-
EffectAllowedValue[SO] val none: EffectAllowedValue
1742-
EffectAllowedValue[SO] val uninitialized: EffectAllowedValue
17431743
Element[JC] var accessKey: String
17441744
Element[JC] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit
17451745
Element[JC] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit

Diff for: api-reports/2_13.txt

+17-17
Original file line numberDiff line numberDiff line change
@@ -1297,14 +1297,29 @@ DOMTokenList[JC] def remove(token: String): Unit
12971297
DOMTokenList[JC] def toggle(token: String): Boolean
12981298
DOMTokenList[JC] def toggle(token: String, force: Boolean): Boolean
12991299
DataTransfer[JT] def clearData(format: String?): Unit
1300-
DataTransfer[JT] var dropEffect: DropEffectValue
1301-
DataTransfer[JT] var effectAllowed: EffectAllowedValue
1300+
DataTransfer[JT] var dropEffect: DataTransferDropEffectKind
1301+
DataTransfer[JT] var effectAllowed: DataTransferEffectAllowedKind
13021302
DataTransfer[JT] def files: FileList
13031303
DataTransfer[JT] def getData(format: String): String
13041304
DataTransfer[JT] def items: DataTransferItemList
13051305
DataTransfer[JT] def setData(format: String, data: String): Unit
13061306
DataTransfer[JT] def setDragImage(image: Element, x: Double, y: Double): Unit
13071307
DataTransfer[JT] def types: FrozenArray[String]
1308+
DataTransferDropEffectKind[JT]
1309+
DataTransferDropEffectKind[SO] val copy: DataTransferDropEffectKind
1310+
DataTransferDropEffectKind[SO] val link: DataTransferDropEffectKind
1311+
DataTransferDropEffectKind[SO] val move: DataTransferDropEffectKind
1312+
DataTransferDropEffectKind[SO] val none: DataTransferDropEffectKind
1313+
DataTransferEffectAllowedKind[JT]
1314+
DataTransferEffectAllowedKind[SO] val all: DataTransferEffectAllowedKind
1315+
DataTransferEffectAllowedKind[SO] val copy: DataTransferEffectAllowedKind
1316+
DataTransferEffectAllowedKind[SO] val copyLink: DataTransferEffectAllowedKind
1317+
DataTransferEffectAllowedKind[SO] val copyMove: DataTransferEffectAllowedKind
1318+
DataTransferEffectAllowedKind[SO] val link: DataTransferEffectAllowedKind
1319+
DataTransferEffectAllowedKind[SO] val linkMove: DataTransferEffectAllowedKind
1320+
DataTransferEffectAllowedKind[SO] val move: DataTransferEffectAllowedKind
1321+
DataTransferEffectAllowedKind[SO] val none: DataTransferEffectAllowedKind
1322+
DataTransferEffectAllowedKind[SO] val uninitialized: DataTransferEffectAllowedKind
13081323
DataTransferItem[JC] def getAsFile(): File
13091324
DataTransferItem[JC] def getAsString(callback: js.Function1[String, Unit]): Unit
13101325
DataTransferItem[JC] def kind: DragDataItemKind
@@ -1680,11 +1695,6 @@ DragEvent[JT] def target: EventTarget
16801695
DragEvent[JT] def timeStamp: Double
16811696
DragEvent[JT] def `type`: String
16821697
DragEvent[JT] def view: Window
1683-
DropEffectValue[JT]
1684-
DropEffectValue[SO] val copy: DropEffectValue
1685-
DropEffectValue[SO] val link: DropEffectValue
1686-
DropEffectValue[SO] val move: DropEffectValue
1687-
DropEffectValue[SO] val none: DropEffectValue
16881698
DynamicsCompressorNode[JT] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit
16891699
DynamicsCompressorNode[JT] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit
16901700
DynamicsCompressorNode[JT] val attack: AudioParam
@@ -1730,16 +1740,6 @@ EcdsaParams[JT] val name: String
17301740
EcdsaParams[SO] def apply(name: String, hash: HashAlgorithmIdentifier): EcdsaParams (@deprecated in 2.0.0)
17311741
EcdsaParams[SO] val hash = hash0
17321742
EcdsaParams[SO] val name = name0
1733-
EffectAllowedValue[JT]
1734-
EffectAllowedValue[SO] val all: EffectAllowedValue
1735-
EffectAllowedValue[SO] val copy: EffectAllowedValue
1736-
EffectAllowedValue[SO] val copyLink: EffectAllowedValue
1737-
EffectAllowedValue[SO] val copyMove: EffectAllowedValue
1738-
EffectAllowedValue[SO] val link: EffectAllowedValue
1739-
EffectAllowedValue[SO] val linkMove: EffectAllowedValue
1740-
EffectAllowedValue[SO] val move: EffectAllowedValue
1741-
EffectAllowedValue[SO] val none: EffectAllowedValue
1742-
EffectAllowedValue[SO] val uninitialized: EffectAllowedValue
17431743
Element[JC] var accessKey: String
17441744
Element[JC] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], options: EventListenerOptions): Unit
17451745
Element[JC] def addEventListener[T <: Event](`type`: String, listener: js.Function1[T, _], useCapture: Boolean?): Unit
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package org.scalajs.dom
2+
3+
import scala.scalajs.js
4+
5+
@js.native
6+
sealed trait DataTransferDropEffectKind extends js.Any
7+
8+
object DataTransferDropEffectKind {
9+
val none: DataTransferDropEffectKind = "none".asInstanceOf[DataTransferDropEffectKind]
10+
val copy: DataTransferDropEffectKind = "copy".asInstanceOf[DataTransferDropEffectKind]
11+
val link: DataTransferDropEffectKind = "link".asInstanceOf[DataTransferDropEffectKind]
12+
val move: DataTransferDropEffectKind = "move".asInstanceOf[DataTransferDropEffectKind]
13+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package org.scalajs.dom
2+
3+
import scala.scalajs.js
4+
5+
@js.native
6+
sealed trait DataTransferEffectAllowedKind extends js.Any
7+
8+
object DataTransferEffectAllowedKind {
9+
val none: DataTransferEffectAllowedKind= "none".asInstanceOf[DataTransferEffectAllowedKind]
10+
val copy: DataTransferEffectAllowedKind= "copy".asInstanceOf[DataTransferEffectAllowedKind]
11+
val copyLink: DataTransferEffectAllowedKind= "copyLink".asInstanceOf[DataTransferEffectAllowedKind]
12+
val copyMove: DataTransferEffectAllowedKind= "copyMove".asInstanceOf[DataTransferEffectAllowedKind]
13+
val link: DataTransferEffectAllowedKind= "link".asInstanceOf[DataTransferEffectAllowedKind]
14+
val linkMove: DataTransferEffectAllowedKind= "linkMove".asInstanceOf[DataTransferEffectAllowedKind]
15+
val move: DataTransferEffectAllowedKind= "move".asInstanceOf[DataTransferEffectAllowedKind]
16+
val all: DataTransferEffectAllowedKind= "all".asInstanceOf[DataTransferEffectAllowedKind]
17+
val uninitialized: DataTransferEffectAllowedKind= "uninitialized".asInstanceOf[DataTransferEffectAllowedKind]
18+
}

Diff for: dom/src/main/scala-2/org/scalajs/dom/DropEffectValue.scala

-13
This file was deleted.

Diff for: dom/src/main/scala-2/org/scalajs/dom/EffectAllowedValue.scala

-18
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package org.scalajs.dom
2+
3+
import scala.scalajs.js
4+
5+
opaque type DataTransferDropEffectKind <: String = String
6+
7+
object DataTransferDropEffectKind {
8+
val none: DataTransferDropEffectKind = "none"
9+
val copy: DataTransferDropEffectKind = "copy"
10+
val link: DataTransferDropEffectKind = "link"
11+
val move: DataTransferDropEffectKind = "move"
12+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package org.scalajs.dom
2+
3+
import scala.scalajs.js
4+
5+
opaque type DataTransferEffectAllowedKind <: String = String
6+
7+
object DataTransferEffectAllowedKind {
8+
val none: DataTransferEffectAllowedKind = "none"
9+
val copy: DataTransferEffectAllowedKind = "copy"
10+
val copyLink: DataTransferEffectAllowedKind = "copyLink"
11+
val copyMove: DataTransferEffectAllowedKind = "copyMove"
12+
val link: DataTransferEffectAllowedKind = "link"
13+
val linkMove: DataTransferEffectAllowedKind = "linkMove"
14+
val move: DataTransferEffectAllowedKind = "move"
15+
val all: DataTransferEffectAllowedKind = "all"
16+
val uninitialized: DataTransferEffectAllowedKind = "uninitialized"
17+
}

Diff for: dom/src/main/scala-3/org/scalajs/dom/DropEffectValue.scala

-12
This file was deleted.

Diff for: dom/src/main/scala-3/org/scalajs/dom/EffectAllowedValue.scala

-17
This file was deleted.

Diff for: dom/src/main/scala/org/scalajs/dom/DataTransfer.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ trait DataTransfer extends js.Object {
2020
* effects for the source, and within the dragenter and dragover events to set the desired effects for the target.
2121
* The value is not used for other events.
2222
*/
23-
var effectAllowed: EffectAllowedValue = js.native
23+
var effectAllowed: DataTransferEffectAllowedKind = js.native
2424

2525
/** The actual effect that will be used. */
26-
var dropEffect: DropEffectValue = js.native
26+
var dropEffect: DataTransferDropEffectKind = js.native
2727

2828
/** Remove the data associated with a given type. The type argument is optional. If the type is empty or not
2929
* specified, the data associated with all types is removed. If data for the specified type does not exist, or the

0 commit comments

Comments
 (0)