From ab15696e99eea446f2179cda9742706b9490cfea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Fri, 7 Oct 2016 16:04:20 +0200 Subject: [PATCH] Reformattings prompted by scalafmt. Not setting up scalafmt in the repo per se because there are still a few "mistakes". --- .../scala/org/scalajs/dom/crypto/Crypto.scala | 15 ++- .../dom/experimental/Notification.scala | 3 +- .../org/scalajs/dom/experimental/Stream.scala | 3 +- .../org/scalajs/dom/experimental/URL.scala | 104 +++++++++--------- .../experimental/domparser/DOMParser.scala | 7 +- .../dom/experimental/intl/package.scala | 2 +- .../mediastream/MediaStream.scala | 23 ++-- .../dom/experimental/push/PushManager.scala | 6 +- .../dom/experimental/push/package.scala | 4 +- .../serviceworkers/ServiceWorkers.scala | 24 ++-- .../dom/experimental/webrtc/WebRTC.scala | 19 ++-- .../org/scalajs/dom/ext/Extensions.scala | 2 + .../scala/org/scalajs/dom/ext/package.scala | 30 ++--- .../scala/org/scalajs/dom/raw/Audio.scala | 6 +- src/main/scala/org/scalajs/dom/raw/Html.scala | 6 +- src/main/scala/org/scalajs/dom/raw/lib.scala | 30 ++--- 16 files changed, 160 insertions(+), 124 deletions(-) diff --git a/src/main/scala/org/scalajs/dom/crypto/Crypto.scala b/src/main/scala/org/scalajs/dom/crypto/Crypto.scala index 43d3f2a70..b9890857d 100644 --- a/src/main/scala/org/scalajs/dom/crypto/Crypto.scala +++ b/src/main/scala/org/scalajs/dom/crypto/Crypto.scala @@ -552,8 +552,9 @@ object AesCtrParams { @inline def apply(name: String, counter: BufferSource, length: Short): AesCtrParams = { - js.Dynamic.literal(name = name, counter = counter, - length = length).asInstanceOf[AesCtrParams] + js.Dynamic + .literal(name = name, counter = counter, length = length) + .asInstanceOf[AesCtrParams] } } @@ -734,8 +735,9 @@ object DhKeyGenParams { @inline def apply(name: String, prime: BigInteger, generator: BigInteger): DhKeyGenParams = { - js.Dynamic.literal(name = name, prime = prime, - generator = generator).asInstanceOf[DhKeyGenParams] + js.Dynamic + .literal(name = name, prime = prime, generator = generator) + .asInstanceOf[DhKeyGenParams] } } @@ -750,8 +752,9 @@ object DhKeyAlgorithm { @inline def apply(name: String, prime: BigInteger, generator: BigInteger): DhKeyAlgorithm = { - js.Dynamic.literal(name = name, prime = prime, - generator = generator).asInstanceOf[DhKeyAlgorithm] + js.Dynamic + .literal(name = name, prime = prime, generator = generator) + .asInstanceOf[DhKeyAlgorithm] } } diff --git a/src/main/scala/org/scalajs/dom/experimental/Notification.scala b/src/main/scala/org/scalajs/dom/experimental/Notification.scala index a92d76c8b..3080af173 100644 --- a/src/main/scala/org/scalajs/dom/experimental/Notification.scala +++ b/src/main/scala/org/scalajs/dom/experimental/Notification.scala @@ -155,7 +155,8 @@ object NotificationOptions { tag: js.UndefOr[String] = js.undefined, onclick: js.UndefOr[js.Function0[Any]] = js.undefined, onerror: js.UndefOr[js.Function0[Any]] = js.undefined, - vibrate: js.UndefOr[js.Array[Double]] = js.undefined): NotificationOptions = { + vibrate: js.UndefOr[js.Array[Double]] = js.undefined + ): NotificationOptions = { val result = js.Dynamic.literal() body.foreach(result.body = _) dir.foreach(result.dir = _) diff --git a/src/main/scala/org/scalajs/dom/experimental/Stream.scala b/src/main/scala/org/scalajs/dom/experimental/Stream.scala index 07bee8edd..8e4a274e9 100644 --- a/src/main/scala/org/scalajs/dom/experimental/Stream.scala +++ b/src/main/scala/org/scalajs/dom/experimental/Stream.scala @@ -274,7 +274,8 @@ class ReadableStreamReader[+T](stream: ReadableStream[T]) extends js.Object { * * //todo determine type of reason */ - def cancel(reason: Any): js.Promise[Any] = js.native //not actually sure what the return type is here + // not actually sure what the return type is here + def cancel(reason: Any): js.Promise[Any] = js.native /** * See [[https://streams.spec.whatwg.org/#reader-read 3.4.4.3. read()]] of diff --git a/src/main/scala/org/scalajs/dom/experimental/URL.scala b/src/main/scala/org/scalajs/dom/experimental/URL.scala index 1e801ab6e..cf6497391 100644 --- a/src/main/scala/org/scalajs/dom/experimental/URL.scala +++ b/src/main/scala/org/scalajs/dom/experimental/URL.scala @@ -3,91 +3,91 @@ package org.scalajs.dom.experimental import scala.scalajs.js /** - * The URL() constructor returns a newly created URL object representing the URL - * defined by the parameters. - * - * MDN - */ + * The URL() constructor returns a newly created URL object representing the URL + * defined by the parameters. + * + * MDN + */ @js.native class URL(url: String, base: String = js.native) extends js.Object { /** - * Returns a DOMString containing the origin of the URL, that is its scheme, - * its domain and its port. - * - * MDN - */ + * Returns a DOMString containing the origin of the URL, that is its scheme, + * its domain and its port. + * + * MDN + */ def origin: String = js.native /** - * Is a DOMString containing the whole URL. - * - * MDN - */ + * Is a DOMString containing the whole URL. + * + * MDN + */ var href: String = js.native /** - * Is a DOMString containing the protocol scheme of the URL, - * including the final ':'. - * - * MDN - */ + * Is a DOMString containing the protocol scheme of the URL, + * including the final ':'. + * + * MDN + */ var protocol: String = js.native /** - * Is a DOMString containing the username specified before the domain name. - * - * MDN - */ + * Is a DOMString containing the username specified before the domain name. + * + * MDN + */ var username: String = js.native /** - * Is a DOMString containing the password specified before the domain name. - * - * MDN - */ + * Is a DOMString containing the password specified before the domain name. + * + * MDN + */ var password: String = js.native /** - * Is a DOMString containing the host, that is the hostname, a ':', - * and the port of the URL. - * - * MDN - */ + * Is a DOMString containing the host, that is the hostname, a ':', + * and the port of the URL. + * + * MDN + */ var host: String = js.native /** - * Is a DOMString containing the domain of the URL. - * - * MDN - */ + * Is a DOMString containing the domain of the URL. + * + * MDN + */ var hostname: String = js.native /** - * Is a DOMString containing the port number of the URL. - * - * MDN - */ + * Is a DOMString containing the port number of the URL. + * + * MDN + */ var port: String = js.native /** - * Is a DOMString containing an initial '/' followed by the path of the URL. - * - * MDN - */ + * Is a DOMString containing an initial '/' followed by the path of the URL. + * + * MDN + */ var pathname: String = js.native /** - * Is a DOMString containing a '?' followed by the parameters of the URL. - * - * MDN - */ + * Is a DOMString containing a '?' followed by the parameters of the URL. + * + * MDN + */ var search: String = js.native /** - * Is a DOMString containing a '#' followed by the fragment identifier of the URL. - * - * MDN - */ + * Is a DOMString containing a '#' followed by the fragment identifier of the URL. + * + * MDN + */ var hash: String = js.native } diff --git a/src/main/scala/org/scalajs/dom/experimental/domparser/DOMParser.scala b/src/main/scala/org/scalajs/dom/experimental/domparser/DOMParser.scala index 92865d04d..42cabd25d 100644 --- a/src/main/scala/org/scalajs/dom/experimental/domparser/DOMParser.scala +++ b/src/main/scala/org/scalajs/dom/experimental/domparser/DOMParser.scala @@ -12,6 +12,7 @@ import org.scalajs.dom.raw.{Document, HTMLDocument} */ @js.native class DOMParser extends js.Object { + /** * The DOMParser can also be used to parse a SVG document or a HTML document. * There are three different results possible, selected by the MIME type given. @@ -21,7 +22,8 @@ class DOMParser extends js.Object { * * MDN */ - def parseFromString(string: String, supportedType: SupportedType): Document = js.native + def parseFromString(string: String, + supportedType: SupportedType): Document = js.native } @js.native @@ -31,6 +33,7 @@ object SupportedType { val `text/html` = "text/html".asInstanceOf[SupportedType] val `text/xml` = "text/xml".asInstanceOf[SupportedType] val `application/xml` = "application/xml".asInstanceOf[SupportedType] - val `application/xhtml+xml` = "application/xhtml+xml".asInstanceOf[SupportedType] + val `application/xhtml+xml` = + "application/xhtml+xml".asInstanceOf[SupportedType] val `image/svg+xml` = "image/svg+xml".asInstanceOf[SupportedType] } diff --git a/src/main/scala/org/scalajs/dom/experimental/intl/package.scala b/src/main/scala/org/scalajs/dom/experimental/intl/package.scala index 66c574273..49f4b41b0 100644 --- a/src/main/scala/org/scalajs/dom/experimental/intl/package.scala +++ b/src/main/scala/org/scalajs/dom/experimental/intl/package.scala @@ -3,7 +3,7 @@ package org.scalajs.dom.experimental /** * The Intl object is the namespace for the ECMAScript Internationalization API, which provides * language sensitive string comparison, number formatting, and date and time formatting. - * + * * The constructors for Collator, NumberFormat, and DateTimeFormat objects are properties of the * Intl object. This page documents these properties as well as functionality common to the * internationalization constructors and other language sensitive functions. diff --git a/src/main/scala/org/scalajs/dom/experimental/mediastream/MediaStream.scala b/src/main/scala/org/scalajs/dom/experimental/mediastream/MediaStream.scala index 6f6a21ac3..5c43cea45 100644 --- a/src/main/scala/org/scalajs/dom/experimental/mediastream/MediaStream.scala +++ b/src/main/scala/org/scalajs/dom/experimental/mediastream/MediaStream.scala @@ -348,7 +348,8 @@ object MediaTrackConstraintSet { sampleSize: js.UndefOr[Double] = js.undefined, echoCancellation: js.UndefOr[Boolean] = js.undefined, deviceId: js.UndefOr[String] = js.undefined, - groupId: js.UndefOr[String] = js.undefined): MediaTrackConstraintSet = { + groupId: js.UndefOr[String] = js.undefined + ): MediaTrackConstraintSet = { val result = js.Dynamic.literal() width.foreach(result.width = _) height.foreach(result.height = _) @@ -373,8 +374,8 @@ trait MediaTrackConstraints extends MediaTrackConstraintSet { object MediaTrackConstraints { @inline def apply( - advanced: js.UndefOr[js.Array[MediaTrackConstraintSet]] = - js.undefined): MediaTrackConstraints = { + advanced: js.UndefOr[js.Array[MediaTrackConstraintSet]] = js.undefined + ): MediaTrackConstraints = { val result = js.Dynamic.literal() advanced.foreach(result.advanced = _) result.asInstanceOf[MediaTrackConstraints] @@ -393,7 +394,8 @@ object SourceInfo { def apply( sourceId: js.UndefOr[Boolean] = js.undefined, kind: js.UndefOr[String] = js.undefined, - label: js.UndefOr[String] = js.undefined): SourceInfo = { + label: js.UndefOr[String] = js.undefined + ): SourceInfo = { val result = js.Dynamic.literal() sourceId.foreach(result.sourceId = _) kind.foreach(result.kind = _) @@ -418,7 +420,8 @@ object MediaStreamTrack { onmute: js.UndefOr[js.Function0[Any]] = js.undefined, onunmute: js.UndefOr[js.Function0[Any]] = js.undefined, onoverconstrained: js.UndefOr[js.Function0[Any]] = js.undefined, - oneended: js.UndefOr[js.Function0[Any]] = js.undefined): MediaStreamTrack = { + oneended: js.UndefOr[js.Function0[Any]] = js.undefined + ): MediaStreamTrack = { val result = js.Dynamic.literal() enabled.foreach(result.enabled = _) id.foreach(result.id = _) @@ -449,7 +452,8 @@ object MediaStreamConstraints { def apply( video: js.UndefOr[Boolean | MediaTrackConstraints] = js.undefined, audio: js.UndefOr[Boolean | MediaTrackConstraints] = js.undefined, - peerIdentity: js.UndefOr[String] = js.undefined): MediaStreamConstraints = { + peerIdentity: js.UndefOr[String] = js.undefined + ): MediaStreamConstraints = { val result = js.Dynamic.literal() video.foreach(v => result.video = v.asInstanceOf[js.Any]) audio.foreach(a => result.audio = a.asInstanceOf[js.Any]) @@ -466,8 +470,8 @@ trait MediaStreamTrackEventInit extends js.Object { object MediaStreamTrackEventInit { @inline def apply( - track: js.UndefOr[MediaStreamTrack] = - js.undefined): MediaStreamTrackEventInit = { + track: js.UndefOr[MediaStreamTrack] = js.undefined + ): MediaStreamTrackEventInit = { val result = js.Dynamic.literal() track.foreach(result.track = _) result.asInstanceOf[MediaStreamTrackEventInit] @@ -550,7 +554,8 @@ object MediaDevicesInfo { deviceId: js.UndefOr[String] = js.undefined, groupId: js.UndefOr[String] = js.undefined, kind: js.UndefOr[String] = js.undefined, - label: js.UndefOr[String] = js.undefined): MediaDevicesInfo = { + label: js.UndefOr[String] = js.undefined + ): MediaDevicesInfo = { val result = js.Dynamic.literal() deviceId.foreach(result.deviceId = _) groupId.foreach(result.groupId = _) diff --git a/src/main/scala/org/scalajs/dom/experimental/push/PushManager.scala b/src/main/scala/org/scalajs/dom/experimental/push/PushManager.scala index c8d289a2c..f721e20fa 100644 --- a/src/main/scala/org/scalajs/dom/experimental/push/PushManager.scala +++ b/src/main/scala/org/scalajs/dom/experimental/push/PushManager.scala @@ -40,7 +40,8 @@ trait PushManager extends js.Object { * * MDN */ - def permissionState(options: PushSubscriptionOptions = js.native): js.Promise[PushPermissionState] = js.native + def permissionState( + options: PushSubscriptionOptions = js.native): js.Promise[PushPermissionState] = js.native /** * The subscribe() method of the PushManager interface subscribes to a push service. @@ -51,7 +52,8 @@ trait PushManager extends js.Object { * * MDN */ - def subscribe(options: PushSubscriptionOptions = js.native): js.Promise[PushSubscription] = js.native + def subscribe( + options: PushSubscriptionOptions = js.native): js.Promise[PushSubscription] = js.native } /** diff --git a/src/main/scala/org/scalajs/dom/experimental/push/package.scala b/src/main/scala/org/scalajs/dom/experimental/push/package.scala index 63fa347dc..8be4ee537 100644 --- a/src/main/scala/org/scalajs/dom/experimental/push/package.scala +++ b/src/main/scala/org/scalajs/dom/experimental/push/package.scala @@ -2,7 +2,9 @@ package org.scalajs.dom.experimental import scala.language.implicitConversions -import org.scalajs.dom.experimental.serviceworkers.{ServiceWorkerGlobalScope, ServiceWorkerRegistration} +import org.scalajs.dom.experimental.serviceworkers.{ + ServiceWorkerGlobalScope, ServiceWorkerRegistration +} import scala.scalajs.js diff --git a/src/main/scala/org/scalajs/dom/experimental/serviceworkers/ServiceWorkers.scala b/src/main/scala/org/scalajs/dom/experimental/serviceworkers/ServiceWorkers.scala index ee847d5e3..0278c4463 100644 --- a/src/main/scala/org/scalajs/dom/experimental/serviceworkers/ServiceWorkers.scala +++ b/src/main/scala/org/scalajs/dom/experimental/serviceworkers/ServiceWorkers.scala @@ -268,8 +268,7 @@ trait ServiceWorkerContainer extends EventTarget { * MDN */ def register(scriptURL: String, - options: js.Object = - new js.Object()): js.Promise[ServiceWorkerRegistration] = js.native + options: js.Object = new js.Object()): js.Promise[ServiceWorkerRegistration] = js.native /** * The ServiceWorkerContainer.controller read-only property of the @@ -289,7 +288,8 @@ trait ServiceWorkerContainer extends EventTarget { * * MDN */ - def getRegistration(scope: String = ""): js.Promise[js.UndefOr[ServiceWorkerRegistration]] = js.native + def getRegistration( + scope: String = ""): js.Promise[js.UndefOr[ServiceWorkerRegistration]] = js.native /** * The getRegistrations() method of the ServiceWorkerContainer interface @@ -299,8 +299,7 @@ trait ServiceWorkerContainer extends EventTarget { * * MDN */ - def getRegistrations(): js.Promise[ - js.Array[ServiceWorkerRegistration]] = js.native + def getRegistrations(): js.Promise[js.Array[ServiceWorkerRegistration]] = js.native /** * The ready read-only property of the ServiceWorkerContainer interface @@ -582,7 +581,8 @@ trait WindowClient extends Client { trait Clients extends js.Object { def get(id: String): js.Promise[js.UndefOr[Client]] = js.native - def matchAll(options: js.UndefOr[ClientQueryOptions] = js.native): js.Promise[js.Array[Client]] = js.native + def matchAll( + options: js.UndefOr[ClientQueryOptions] = js.native): js.Promise[js.Array[Client]] = js.native def openWindow(url: String): js.Promise[WindowClient] = js.native @@ -595,9 +595,11 @@ trait Clients extends js.Object { */ @js.native abstract class Cache extends js.Object { - def `match`(request: RequestInfo, options: js.UndefOr[CacheQueryOptions] = js.native): js.Promise[js.UndefOr[Response]] = js.native + def `match`(request: RequestInfo, + options: js.UndefOr[CacheQueryOptions] = js.native): js.Promise[js.UndefOr[Response]] = js.native - def matchAll(request: RequestInfo = js.native, options: js.UndefOr[CacheQueryOptions] = js.native): js.Promise[js.Array[Response]] = js.native + def matchAll(request: RequestInfo = js.native, + options: js.UndefOr[CacheQueryOptions] = js.native): js.Promise[js.Array[Response]] = js.native def add(request: RequestInfo): js.Promise[Unit] = js.native @@ -606,9 +608,11 @@ abstract class Cache extends js.Object { def put(request: RequestInfo, response: Response): js.Promise[Unit] = js.native - def delete(request: RequestInfo, options: js.UndefOr[CacheQueryOptions] = js.native): js.Promise[Boolean] = js.native + def delete(request: RequestInfo, + options: js.UndefOr[CacheQueryOptions] = js.native): js.Promise[Boolean] = js.native - def keys(request: js.UndefOr[RequestInfo] = js.native, options: js.UndefOr[CacheQueryOptions] = js.native): js.Promise[js.Array[Request]] + def keys(request: js.UndefOr[RequestInfo] = js.native, + options: js.UndefOr[CacheQueryOptions] = js.native): js.Promise[js.Array[Request]] } /** diff --git a/src/main/scala/org/scalajs/dom/experimental/webrtc/WebRTC.scala b/src/main/scala/org/scalajs/dom/experimental/webrtc/WebRTC.scala index 012f79a7e..35861a3c6 100644 --- a/src/main/scala/org/scalajs/dom/experimental/webrtc/WebRTC.scala +++ b/src/main/scala/org/scalajs/dom/experimental/webrtc/WebRTC.scala @@ -18,8 +18,10 @@ trait RTCIdentityAssertion extends js.Object { object RTCIdentityAssertion { @inline - def apply(idp: js.UndefOr[String] = js.undefined, - name: js.UndefOr[String] = js.undefined): RTCIdentityAssertion = { + def apply( + idp: js.UndefOr[String] = js.undefined, + name: js.UndefOr[String] = js.undefined + ): RTCIdentityAssertion = { val result = js.Dynamic.literal() idp.foreach(result.idp = _) name.foreach(result.name = _) @@ -83,7 +85,8 @@ object RTCOfferOptions { iceRestart: js.UndefOr[Boolean] = js.undefined, offerToReceiveAudio: js.UndefOr[Double] = js.undefined, offerToReceiveVideo: js.UndefOr[Double] = js.undefined, - voiceActivityDetection: js.UndefOr[Boolean] = js.undefined): RTCOfferOptions = { + voiceActivityDetection: js.UndefOr[Boolean] = js.undefined + ): RTCOfferOptions = { val result = js.Dynamic.literal() iceRestart.foreach(result.iceRestart = _) offerToReceiveAudio.foreach(result.offerToReceiveAudio = _) @@ -288,7 +291,8 @@ object RTCIceCandidateInit { def apply( candidate: js.UndefOr[String] = js.undefined, sdpMid: js.UndefOr[String] = js.undefined, - sdpMLineIndex: js.UndefOr[Double] = js.undefined): RTCIceCandidateInit = { + sdpMLineIndex: js.UndefOr[Double] = js.undefined + ): RTCIceCandidateInit = { val result = js.Dynamic.literal() candidate.foreach(result.candidate = _) sdpMid.foreach(result.sdpMid = _) @@ -514,7 +518,8 @@ object RTCDataChannelInit { maxRetransmits: js.UndefOr[Double] = js.undefined, protocol: js.UndefOr[String] = js.undefined, negotiated: js.UndefOr[Boolean] = js.undefined, - id: js.UndefOr[Double] = js.undefined): RTCDataChannelInit = { + id: js.UndefOr[Double] = js.undefined + ): RTCDataChannelInit = { val result = js.Dynamic.literal() ordered.foreach(result.ordered = _) maxPacketLifeTime.foreach(result.maxPacketLifeTime = _) @@ -632,8 +637,8 @@ trait RTCPeerConnectionIceEventInit extends js.Object { object RTCPeerConnectionIceEventInit { @inline def apply( - candidate: js.UndefOr[RTCIceCandidate] = - js.undefined): RTCPeerConnectionIceEventInit = { + candidate: js.UndefOr[RTCIceCandidate] = js.undefined + ): RTCPeerConnectionIceEventInit = { val result = js.Dynamic.literal() candidate.foreach(result.candidate = _) result.asInstanceOf[RTCPeerConnectionIceEventInit] diff --git a/src/main/scala/org/scalajs/dom/ext/Extensions.scala b/src/main/scala/org/scalajs/dom/ext/Extensions.scala index b3a0718c3..ed9da31ee 100644 --- a/src/main/scala/org/scalajs/dom/ext/Extensions.scala +++ b/src/main/scala/org/scalajs/dom/ext/Extensions.scala @@ -168,6 +168,7 @@ object KeyCode { final val F11 = 122 final val F12 = 123 + // format: off @deprecated("Use KeyCode.Backspace instead", "0.8.1") final val backspace = Backspace @deprecated("Use KeyCode.Tab instead", "0.8.1") final val tab = Tab @deprecated("Use KeyCode.Enter instead", "0.8.1") final val enter = Enter @@ -224,6 +225,7 @@ object KeyCode { @deprecated("Use KeyCode.X instead", "0.8.1") final val x = X @deprecated("Use KeyCode.Y instead", "0.8.1") final val y = Y @deprecated("Use KeyCode.Z instead", "0.8.1") final val z = Z + // format: on } /** diff --git a/src/main/scala/org/scalajs/dom/ext/package.scala b/src/main/scala/org/scalajs/dom/ext/package.scala index f178a6460..49065373c 100644 --- a/src/main/scala/org/scalajs/dom/ext/package.scala +++ b/src/main/scala/org/scalajs/dom/ext/package.scala @@ -77,24 +77,28 @@ package object ext { * Implicit class to deal with attributes as with normal mutable Map * @param attributes */ - implicit class Attributes(attributes:NamedNodeMap) extends mutable.Map[String,Attr] { - self => + implicit class Attributes(attributes: NamedNodeMap) + extends mutable.Map[String, Attr] { self => - override def iterator: Iterator[(String, Attr)] = new Iterator[(String, Attr)] { - var index = 0 + override def iterator: Iterator[(String, Attr)] = { + new Iterator[(String, Attr)] { + var index = 0 - override def next(): (String, Attr) = { - val n: Attr = attributes.item(index) - this.index = this.index + 1 - (n.name, n) - } + override def next(): (String, Attr) = { + val n: Attr = attributes.item(index) + this.index = this.index + 1 + (n.name, n) + } - override def hasNext: Boolean = index < self.length + override def hasNext: Boolean = index < self.length + } } - override def get(key: String): Option[Attr] = attributes.getNamedItem(key) match { - case null => None - case attr => Some(attr) + override def get(key: String): Option[Attr] = { + attributes.getNamedItem(key) match { + case null => None + case attr => Some(attr) + } } def length: Int = attributes.length.toInt diff --git a/src/main/scala/org/scalajs/dom/raw/Audio.scala b/src/main/scala/org/scalajs/dom/raw/Audio.scala index ba5cdeec5..138830dfc 100644 --- a/src/main/scala/org/scalajs/dom/raw/Audio.scala +++ b/src/main/scala/org/scalajs/dom/raw/Audio.scala @@ -199,9 +199,11 @@ class AudioContext extends EventTarget { * @param errorCallback An optional error callback, to be invoked if an * error occurs when the audio data is being decoded. */ - def decodeAudioData(audioData: js.typedarray.ArrayBuffer, + def decodeAudioData( + audioData: js.typedarray.ArrayBuffer, successCallback: js.Function1[AudioBuffer, _] = js.native, - errorCallback: js.Function0[_] = js.native): js.Promise[AudioBuffer] = js.native + errorCallback: js.Function0[_] = js.native + ): js.Promise[AudioBuffer] = js.native /** Resumes the progression of time in an audio context that has previously * been suspended. diff --git a/src/main/scala/org/scalajs/dom/raw/Html.scala b/src/main/scala/org/scalajs/dom/raw/Html.scala index 4aaf1b967..172d9b721 100644 --- a/src/main/scala/org/scalajs/dom/raw/Html.scala +++ b/src/main/scala/org/scalajs/dom/raw/Html.scala @@ -3887,15 +3887,15 @@ abstract class HTMLElement extends Element { * * - a ''negative value'' means that the element should be focusable, but should not be * reachable via sequential keyboard navigation; - * + * * - '''0''' means that the element should be focusable and reachable via sequential keyboard * navigation, but its relative order is defined by the platform convention; - * + * * - a ''positive value'' which means should be focusable and reachable via sequential keyboard * navigation; its relative order is defined by the value of the attribute: the sequential * follow the increasing number of the '''tabindex'''. If several elements share the same * tabindex, their relative order follows their relative position in the document). - * + * * An element with a '''0''' value, an invalid value, or no '''tabindex''' value should be placed * after elements with a positive '''tabindex''' in the sequential keyboard navigation order. * diff --git a/src/main/scala/org/scalajs/dom/raw/lib.scala b/src/main/scala/org/scalajs/dom/raw/lib.scala index 00399cf2d..d09ca3df0 100644 --- a/src/main/scala/org/scalajs/dom/raw/lib.scala +++ b/src/main/scala/org/scalajs/dom/raw/lib.scala @@ -4325,6 +4325,7 @@ trait MutationObserverInit extends js.Object { /** Factory for [[MutationObserverInit]] objects. */ object MutationObserverInit { + /** * Creates a new [[MutationObserverInit]] object with the given values. * Default values for the `Boolean` parameters are `false`. @@ -4332,21 +4333,22 @@ object MutationObserverInit { * have `attributeFilter` property. */ def apply( - childList: Boolean = false, - attributes: Boolean = false, - characterData: Boolean = false, - subtree: Boolean = false, - attributeOldValue: Boolean = false, - characterDataOldValue: Boolean = false, - attributeFilter: js.UndefOr[js.Array[String]] = js.undefined): MutationObserverInit = { + childList: Boolean = false, + attributes: Boolean = false, + characterData: Boolean = false, + subtree: Boolean = false, + attributeOldValue: Boolean = false, + characterDataOldValue: Boolean = false, + attributeFilter: js.UndefOr[js.Array[String]] = js.undefined + ): MutationObserverInit = { val res = js.Dynamic.literal( - "childList" -> childList, - "attributes" -> attributes, - "characterData" -> characterData, - "subtree" -> subtree, - "attributeOldValue" -> attributeOldValue, - "characterDataOldValue" -> characterDataOldValue) - .asInstanceOf[MutationObserverInit] + "childList" -> childList, + "attributes" -> attributes, + "characterData" -> characterData, + "subtree" -> subtree, + "attributeOldValue" -> attributeOldValue, + "characterDataOldValue" -> characterDataOldValue + ).asInstanceOf[MutationObserverInit] attributeFilter.foreach(res.attributeFilter = _) res }