Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/patch-1' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
c committed Mar 20, 2024
2 parents 995cb29 + 5e28185 commit 34d6117
Show file tree
Hide file tree
Showing 9 changed files with 768 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ghpages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
run: sbt readme/run

- name: Deploy
uses: JamesIves/github-pages-deploy-action@v4.4.3
uses: JamesIves/github-pages-deploy-action@v4.5.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
Expand Down
373 changes: 372 additions & 1 deletion api-reports/2_12.txt

Large diffs are not rendered by default.

373 changes: 372 additions & 1 deletion api-reports/2_13.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ class CanvasRenderingContext2D extends js.Object {
/** A CSS color, a CanvasGradient or CanvasPattern, to use as a fill. */
var fillStyle: js.Any = js.native

/** A CSS filter, which will be applied on the entire canvas. */
var filter: String = js.native

/** Specifies the blurring effect. Default 0 */
var shadowBlur: Double = js.native

Expand Down
12 changes: 12 additions & 0 deletions dom/src/main/scala/org/scalajs/dom/Element.scala
Original file line number Diff line number Diff line change
Expand Up @@ -301,4 +301,16 @@ abstract class Element extends Node with NodeSelector with ParentNode with NonDo
* specified CSS selector.
*/
def closest(selector: String): Element = js.native

/** Fired when a text composition system such as an input method editor starts a new composition session. */
var oncompositionstart: js.Function1[CompositionEvent, _] = js.native

/** Fired when a new character is received in the context of a text composition session. */
var oncompositionupdate: js.Function1[CompositionEvent, _] = js.native

/** Fired when a text composition system such as an input method editor completes or cancels the current composition
* session.
*/
var oncompositionend: js.Function1[CompositionEvent, _] = js.native

}
2 changes: 1 addition & 1 deletion dom/src/main/scala/org/scalajs/dom/EventSource.scala
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class EventSource private[this] extends EventTarget {

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

var onerror: js.Function1[ErrorEvent, _] = js.native
var onerror: js.Function1[Event, _] = js.native

/** The close() method must abort any instances of the fetch algorithm started for this EventSource object, and must
* set the readyState attribute to CLOSED. W3C 2012
Expand Down
5 changes: 5 additions & 0 deletions dom/src/main/scala/org/scalajs/dom/KeyboardEvent.scala
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ class KeyboardEvent(typeArg: String, init: js.UndefOr[KeyboardEventInit])

/** Returns a string with the code value of the physical key represented by the event. */
def code: String = js.native

/** Returns a boolean value that is true if the event is fired between after compositionstart and before
* compositionend.
*/
def isComposing: Boolean = js.native
}

@js.native
Expand Down
2 changes: 1 addition & 1 deletion dom/src/main/scala/org/scalajs/dom/URLSearchParams.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class URLSearchParams extends js.Iterable[js.Tuple2[String, String]] {

/** Leading '?' characters are ignored. */
def this(init: String) = this()
def this(init: Sequence[String]) = this()
def this(init: Sequence[js.Tuple2[String, String]]) = this()
def this(init: js.Dictionary[String]) = this()

def append(name: String, value: String): Unit = js.native
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.7
sbt.version=1.9.9

0 comments on commit 34d6117

Please sign in to comment.