Skip to content

Commit d596e1b

Browse files
committed
Move KeyValue, KeyCode and KeyLocation from ext.* to dom.*.
1 parent a90f690 commit d596e1b

File tree

3 files changed

+98
-84
lines changed

3 files changed

+98
-84
lines changed

src/main/scala/org/scalajs/dom/ext/KeyValue.scala renamed to src/main/scala/org/scalajs/dom/KeyboardEventConstants.scala

Lines changed: 83 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scalajs.dom.ext
1+
package org.scalajs.dom
22

33
/**
44
* The KeyboardEvent.key attribute of an event must always contain one of these control key or character values (even if
@@ -738,3 +738,85 @@ object KeyValue {
738738
final val ZoomToggle = "ZoomToggle"
739739
}
740740
}
741+
742+
/**
743+
* A list of the codes returned by KeyEvents.
744+
*/
745+
object KeyCode {
746+
final val Backspace = 8
747+
final val Tab = 9
748+
final val Enter = 13
749+
final val Shift = 16
750+
final val Ctrl = 17
751+
final val Alt = 18
752+
final val Pause = 19
753+
final val CapsLock = 20
754+
final val Escape = 27
755+
final val Space = 32
756+
final val PageUp = 33
757+
final val PageDown = 34
758+
final val End = 35
759+
final val Home = 36
760+
final val Left = 37
761+
final val Up = 38
762+
final val Right = 39
763+
final val Down = 40
764+
final val Insert = 45
765+
final val Delete = 46
766+
final val Num0 = 48
767+
final val Num1 = 49
768+
final val Num2 = 50
769+
final val Num3 = 51
770+
final val Num4 = 52
771+
final val Num5 = 53
772+
final val Num6 = 54
773+
final val Num7 = 55
774+
final val Num8 = 56
775+
final val Num9 = 57
776+
final val A = 65
777+
final val B = 66
778+
final val C = 67
779+
final val D = 68
780+
final val E = 69
781+
final val F = 70
782+
final val G = 71
783+
final val H = 72
784+
final val I = 73
785+
final val J = 74
786+
final val K = 75
787+
final val L = 76
788+
final val M = 77
789+
final val N = 78
790+
final val O = 79
791+
final val P = 80
792+
final val Q = 81
793+
final val R = 82
794+
final val S = 83
795+
final val T = 84
796+
final val U = 85
797+
final val V = 86
798+
final val W = 87
799+
final val X = 88
800+
final val Y = 89
801+
final val Z = 90
802+
final val F1 = 112
803+
final val F2 = 113
804+
final val F3 = 114
805+
final val F4 = 115
806+
final val F5 = 116
807+
final val F6 = 117
808+
final val F7 = 118
809+
final val F8 = 119
810+
final val F9 = 120
811+
final val F10 = 121
812+
final val F11 = 122
813+
final val F12 = 123
814+
}
815+
816+
/** Aliases for DOM_KEY_LOCATION_* constants from [[KeyboardEvent]] */
817+
object KeyLocation {
818+
final val Standard = KeyboardEvent.DOM_KEY_LOCATION_STANDARD
819+
final val Left = KeyboardEvent.DOM_KEY_LOCATION_LEFT
820+
final val Right = KeyboardEvent.DOM_KEY_LOCATION_RIGHT
821+
final val NumPad = KeyboardEvent.DOM_KEY_LOCATION_NUMPAD
822+
}

src/main/scala/org/scalajs/dom/ext/Extensions.scala

Lines changed: 1 addition & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -10,89 +10,7 @@ import scala.scalajs.js.typedarray._
1010
import scala.scalajs.js.typedarray.TypedArrayBufferOps._
1111

1212
import org.scalajs.dom
13-
import org.scalajs.dom.{Blob, FormData, KeyboardEvent}
14-
15-
/**
16-
* A list of the codes returned by KeyEvents.
17-
*/
18-
object KeyCode {
19-
final val Backspace = 8
20-
final val Tab = 9
21-
final val Enter = 13
22-
final val Shift = 16
23-
final val Ctrl = 17
24-
final val Alt = 18
25-
final val Pause = 19
26-
final val CapsLock = 20
27-
final val Escape = 27
28-
final val Space = 32
29-
final val PageUp = 33
30-
final val PageDown = 34
31-
final val End = 35
32-
final val Home = 36
33-
final val Left = 37
34-
final val Up = 38
35-
final val Right = 39
36-
final val Down = 40
37-
final val Insert = 45
38-
final val Delete = 46
39-
final val Num0 = 48
40-
final val Num1 = 49
41-
final val Num2 = 50
42-
final val Num3 = 51
43-
final val Num4 = 52
44-
final val Num5 = 53
45-
final val Num6 = 54
46-
final val Num7 = 55
47-
final val Num8 = 56
48-
final val Num9 = 57
49-
final val A = 65
50-
final val B = 66
51-
final val C = 67
52-
final val D = 68
53-
final val E = 69
54-
final val F = 70
55-
final val G = 71
56-
final val H = 72
57-
final val I = 73
58-
final val J = 74
59-
final val K = 75
60-
final val L = 76
61-
final val M = 77
62-
final val N = 78
63-
final val O = 79
64-
final val P = 80
65-
final val Q = 81
66-
final val R = 82
67-
final val S = 83
68-
final val T = 84
69-
final val U = 85
70-
final val V = 86
71-
final val W = 87
72-
final val X = 88
73-
final val Y = 89
74-
final val Z = 90
75-
final val F1 = 112
76-
final val F2 = 113
77-
final val F3 = 114
78-
final val F4 = 115
79-
final val F5 = 116
80-
final val F6 = 117
81-
final val F7 = 118
82-
final val F8 = 119
83-
final val F9 = 120
84-
final val F10 = 121
85-
final val F11 = 122
86-
final val F12 = 123
87-
}
88-
89-
/** Aliases for DOM_KEY_LOCATION_* constants from [[KeyboardEvent]] */
90-
object KeyLocation {
91-
final val Standard = KeyboardEvent.DOM_KEY_LOCATION_STANDARD
92-
final val Left = KeyboardEvent.DOM_KEY_LOCATION_LEFT
93-
final val Right = KeyboardEvent.DOM_KEY_LOCATION_RIGHT
94-
final val NumPad = KeyboardEvent.DOM_KEY_LOCATION_NUMPAD
95-
}
13+
import org.scalajs.dom.{Blob, FormData}
9614

9715
/**
9816
* Thrown when `Ajax.get` or `Ajax.post` receives a non-20X response code.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package org.scalajs.dom
2+
3+
import org.scalajs.dom
4+
5+
package object ext {
6+
@deprecated("use dom.KeyValue instead", "2.0.0")
7+
val KeyValue: dom.KeyValue.type = dom.KeyValue
8+
9+
@deprecated("use dom.KeyCode instead", "2.0.0")
10+
val KeyCode: dom.KeyCode.type = dom.KeyCode
11+
12+
@deprecated("use dom.KeyLocation instead", "2.0.0")
13+
val KeyLocation: dom.KeyLocation.type = dom.KeyLocation
14+
}

0 commit comments

Comments
 (0)