Skip to content

Commit 34d6117

Browse files
author
c
committed
Merge remote-tracking branch 'origin/patch-1' into patch-1
2 parents 995cb29 + 5e28185 commit 34d6117

File tree

9 files changed

+768
-6
lines changed

9 files changed

+768
-6
lines changed

.github/workflows/ghpages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
run: sbt readme/run
2020

2121
- name: Deploy
22-
uses: JamesIves/github-pages-deploy-action@v4.4.3
22+
uses: JamesIves/github-pages-deploy-action@v4.5.0
2323
with:
2424
token: ${{ secrets.GITHUB_TOKEN }}
2525
branch: gh-pages

api-reports/2_12.txt

Lines changed: 372 additions & 1 deletion
Large diffs are not rendered by default.

api-reports/2_13.txt

Lines changed: 372 additions & 1 deletion
Large diffs are not rendered by default.

dom/src/main/scala/org/scalajs/dom/CanvasRenderingContext2D.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ class CanvasRenderingContext2D extends js.Object {
6262
/** A CSS color, a CanvasGradient or CanvasPattern, to use as a fill. */
6363
var fillStyle: js.Any = js.native
6464

65+
/** A CSS filter, which will be applied on the entire canvas. */
66+
var filter: String = js.native
67+
6568
/** Specifies the blurring effect. Default 0 */
6669
var shadowBlur: Double = js.native
6770

dom/src/main/scala/org/scalajs/dom/Element.scala

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,4 +301,16 @@ abstract class Element extends Node with NodeSelector with ParentNode with NonDo
301301
* specified CSS selector.
302302
*/
303303
def closest(selector: String): Element = js.native
304+
305+
/** Fired when a text composition system such as an input method editor starts a new composition session. */
306+
var oncompositionstart: js.Function1[CompositionEvent, _] = js.native
307+
308+
/** Fired when a new character is received in the context of a text composition session. */
309+
var oncompositionupdate: js.Function1[CompositionEvent, _] = js.native
310+
311+
/** Fired when a text composition system such as an input method editor completes or cancels the current composition
312+
* session.
313+
*/
314+
var oncompositionend: js.Function1[CompositionEvent, _] = js.native
315+
304316
}

dom/src/main/scala/org/scalajs/dom/EventSource.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class EventSource private[this] extends EventTarget {
4141

4242
var onmessage: js.Function1[MessageEvent, _] = js.native
4343

44-
var onerror: js.Function1[ErrorEvent, _] = js.native
44+
var onerror: js.Function1[Event, _] = js.native
4545

4646
/** The close() method must abort any instances of the fetch algorithm started for this EventSource object, and must
4747
* set the readyState attribute to CLOSED. W3C 2012

dom/src/main/scala/org/scalajs/dom/KeyboardEvent.scala

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ class KeyboardEvent(typeArg: String, init: js.UndefOr[KeyboardEventInit])
5757

5858
/** Returns a string with the code value of the physical key represented by the event. */
5959
def code: String = js.native
60+
61+
/** Returns a boolean value that is true if the event is fired between after compositionstart and before
62+
* compositionend.
63+
*/
64+
def isComposing: Boolean = js.native
6065
}
6166

6267
@js.native

dom/src/main/scala/org/scalajs/dom/URLSearchParams.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class URLSearchParams extends js.Iterable[js.Tuple2[String, String]] {
1010

1111
/** Leading '?' characters are ignored. */
1212
def this(init: String) = this()
13-
def this(init: Sequence[String]) = this()
13+
def this(init: Sequence[js.Tuple2[String, String]]) = this()
1414
def this(init: js.Dictionary[String]) = this()
1515

1616
def append(name: String, value: String): Unit = js.native

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.9.7
1+
sbt.version=1.9.9

0 commit comments

Comments
 (0)