Skip to content

Commit 30c237b

Browse files
committed
Move the Map view of NamedNodeMap to its companion object.
So that it is always available. We also make the implementation class private.
1 parent f8166bc commit 30c237b

File tree

6 files changed

+14
-28
lines changed

6 files changed

+14
-28
lines changed

api-reports/2_12.txt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13460,6 +13460,7 @@ NamedNodeMap[JC] def removeNamedItemNS(namespaceURI: String, localName: String):
1346013460
NamedNodeMap[JC] def setNamedItem(arg: Attr): Attr
1346113461
NamedNodeMap[JC] def setNamedItemNS(arg: Attr): Attr
1346213462
NamedNodeMap[JC] @scala.scalajs.js.annotation.JSBracketAccess def update(index: Int, v: Attr): Unit
13463+
NamedNodeMap[SO] implicit def namedNodeMapAsMap(namedNodeMap: NamedNodeMap): mutable.Map[String, Attr]
1346313464
Navigator[JC] def appName: String
1346413465
Navigator[JC] def appVersion: String
1346513466
Navigator[JC] def clipboard: Clipboard
@@ -24615,15 +24616,6 @@ ext/KeyValue.Multimedia[SO] final val SpellCheck = "SpellCheck"
2461524616
ext/KeyValue.Multimedia[SO] final val VolumeDown = "VolumeDown"
2461624617
ext/KeyValue.Multimedia[SO] final val VolumeMute = "VolumeMute"
2461724618
ext/KeyValue.Multimedia[SO] final val VolumeUp = "VolumeUp"
24618-
ext/NamedNodeMapMap[SC] override def + = (kv: (String, Attr)): this.type
24619-
ext/NamedNodeMapMap[SC] override def - = (key: String): this.type
24620-
ext/NamedNodeMapMap[SC] override def clear(): Unit
24621-
ext/NamedNodeMapMap[SC] override def get(key: String): Option[Attr]
24622-
ext/NamedNodeMapMap[SC] override def hasNext: Boolean
24623-
ext/NamedNodeMapMap[SC] override def iterator: Iterator[(String, Attr)]
24624-
ext/NamedNodeMapMap[SC] def length: Int
24625-
ext/NamedNodeMapMap[SC] override def next(): (String, Attr)
24626-
ext/package[SO] implicit def pimpNamedNodeMap(namedNodeMap: NamedNodeMap): NamedNodeMapMap
2462724619
ext/package.PimpedHtmlCollection[SC] def apply(x: Int) = jsApply(x)
2462824620
ext/package.PimpedHtmlCollection[SC] def hasNext: scala.Boolean
2462924621
ext/package.PimpedHtmlCollection[SC] def iterator = new Iterator[T] { var index = 0 def hasNext: scala.Boolean = index < jsLength def next() = { val res = jsApply(index) index + = 1 res } }

api-reports/2_13.txt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13460,6 +13460,7 @@ NamedNodeMap[JC] def removeNamedItemNS(namespaceURI: String, localName: String):
1346013460
NamedNodeMap[JC] def setNamedItem(arg: Attr): Attr
1346113461
NamedNodeMap[JC] def setNamedItemNS(arg: Attr): Attr
1346213462
NamedNodeMap[JC] @scala.scalajs.js.annotation.JSBracketAccess def update(index: Int, v: Attr): Unit
13463+
NamedNodeMap[SO] implicit def namedNodeMapAsMap(namedNodeMap: NamedNodeMap): mutable.Map[String, Attr]
1346313464
Navigator[JC] def appName: String
1346413465
Navigator[JC] def appVersion: String
1346513466
Navigator[JC] def clipboard: Clipboard
@@ -24615,15 +24616,6 @@ ext/KeyValue.Multimedia[SO] final val SpellCheck = "SpellCheck"
2461524616
ext/KeyValue.Multimedia[SO] final val VolumeDown = "VolumeDown"
2461624617
ext/KeyValue.Multimedia[SO] final val VolumeMute = "VolumeMute"
2461724618
ext/KeyValue.Multimedia[SO] final val VolumeUp = "VolumeUp"
24618-
ext/NamedNodeMapMap[SC] override def addOne(kv: (String, Attr)): this.type
24619-
ext/NamedNodeMapMap[SC] override def clear(): Unit
24620-
ext/NamedNodeMapMap[SC] override def get(key: String): Option[Attr]
24621-
ext/NamedNodeMapMap[SC] override def hasNext: Boolean
24622-
ext/NamedNodeMapMap[SC] override def iterator: Iterator[(String, Attr)]
24623-
ext/NamedNodeMapMap[SC] def length: Int
24624-
ext/NamedNodeMapMap[SC] override def next(): (String, Attr)
24625-
ext/NamedNodeMapMap[SC] override def subtractOne(key: String): this.type
24626-
ext/package[SO] implicit def pimpNamedNodeMap(namedNodeMap: NamedNodeMap): NamedNodeMapMap
2462724619
ext/package.PimpedHtmlCollection[SC] def apply(x: Int) = jsApply(x)
2462824620
ext/package.PimpedHtmlCollection[SC] def hasNext: scala.Boolean
2462924621
ext/package.PimpedHtmlCollection[SC] def iterator = new Iterator[T] { var index = 0 def hasNext: scala.Boolean = index < jsLength def next() = { val res = jsApply(index) index + = 1 res } }

src/main/scala-new-collections/org/scalajs/dom/ext/NamedNodeMapMap.scala renamed to src/main/scala-new-collections/org/scalajs/dom/NamedNodeMapMap.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
package org.scalajs.dom.ext
1+
package org.scalajs.dom
22

3-
import org.scalajs.dom._
43
import scala.collection.mutable
54

6-
class NamedNodeMapMap private[ext] (namedNodeMap: NamedNodeMap)
5+
private[dom] class NamedNodeMapMap(namedNodeMap: NamedNodeMap)
76
extends mutable.Map[String, Attr] {
87
self =>
98

src/main/scala-old-collections/org/scalajs/dom/ext/NamedNodeMapMap.scala renamed to src/main/scala-old-collections/org/scalajs/dom/NamedNodeMapMap.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
package org.scalajs.dom.ext
1+
package org.scalajs.dom
22

3-
import org.scalajs.dom._
43
import scala.collection.mutable
54

6-
class NamedNodeMapMap private[ext] (namedNodeMap: NamedNodeMap)
5+
private[dom] class NamedNodeMapMap(namedNodeMap: NamedNodeMap)
76
extends mutable.Map[String, Attr] {
87
self =>
98

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.scalajs.dom
22

3-
import scala.language.implicitConversions
4-
53
package object ext {
64

75
implicit class PimpedNodeList(nodes: NodeList)
@@ -16,6 +14,4 @@ package object ext {
1614
implicit class PimpedSVGTransformList(coll: svg.TransformList)
1715
extends EasySeq[svg.Transform](coll.numberOfItems, coll.getItem)
1816

19-
implicit def pimpNamedNodeMap(namedNodeMap: NamedNodeMap): NamedNodeMapMap =
20-
new NamedNodeMapMap(namedNodeMap)
2117
}

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
package org.scalajs.dom
1111

1212
import org.scalajs.dom.experimental.ReadableStream
13+
import scala.collection.mutable
14+
import scala.language.implicitConversions
1315
import scala.scalajs.js
1416
import scala.scalajs.js.annotation._
1517
import scala.scalajs.js.typedarray.ArrayBuffer
@@ -6179,6 +6181,12 @@ class NamedNodeMap extends js.Object {
61796181
def setNamedItemNS(arg: Attr): Attr = js.native
61806182
}
61816183

6184+
object NamedNodeMap {
6185+
implicit def namedNodeMapAsMap(
6186+
namedNodeMap: NamedNodeMap): mutable.Map[String, Attr] =
6187+
new NamedNodeMapMap(namedNodeMap)
6188+
}
6189+
61826190
@js.native
61836191
@JSGlobal
61846192
class MediaList extends js.Object {

0 commit comments

Comments
 (0)