Skip to content

Commit 3590804

Browse files
committed
Merge pull request #1 from sjrd/official2
Prepare for official publication
2 parents 86df3c0 + a73c2b4 commit 3590804

File tree

10 files changed

+53
-39
lines changed

10 files changed

+53
-39
lines changed

build.sbt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
scalaJSSettings
22

3-
name := "Dom"
3+
name := "Scala.js DOM"
44

5-
version := "0.1-SNAPSHOT"
5+
normalizedName := "scalajs-dom"
6+
7+
version := "0.1-SNAPSHOT"
8+
9+
organization := "org.scala-lang.modules.scalajs"

project/build.sbt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
resolvers += Resolver.url("scala-js-snapshots",
2+
url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns)
3+
14
addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.1-SNAPSHOT")
25

36
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.1")
4-
5-

src/main/scala/scala/scalajs/js/Css.scala renamed to src/main/scala/org/scalajs/dom/Css.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package scala.scalajs
2-
package js
1+
package org.scalajs.dom
2+
3+
import scala.scalajs.js
34

45
trait CSSStyleDeclaration extends js.Object {
56
var backgroundAttachment: js.String = _
@@ -439,4 +440,4 @@ trait CSSKeyframeRule extends CSSRule {
439440

440441
object CSSKeyframeRule extends js.Object {
441442
/* ??? ConstructorMember(FunSignature(List(),List(),Some(TypeRef(TypeName(CSSKeyframeRule),List())))) */
442-
}
443+
}

src/main/scala/scala/scalajs/js/Html.scala renamed to src/main/scala/org/scalajs/dom/Html.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package scala.scalajs
2-
package js
1+
package org.scalajs.dom
2+
3+
import scala.scalajs.js
34

45
trait HTMLTableElement extends HTMLElement with MSDataBindingTableExtensions with MSDataBindingExtensions {
56
var width: js.String = _

src/main/scala/scala/scalajs/js/Idb.scala renamed to src/main/scala/org/scalajs/dom/Idb.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package scala.scalajs
2-
package js
1+
package org.scalajs.dom
2+
3+
import scala.scalajs.js
34

45
trait IDBObjectStore extends js.Object {
56
var indexNames: DOMStringList = _

src/main/scala/scala/scalajs/js/Ms.scala renamed to src/main/scala/org/scalajs/dom/Ms.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package scala.scalajs
2-
package js
1+
package org.scalajs.dom
2+
3+
import scala.scalajs.js
34

45
class MSCSSMatrix extends js.Object {
56
def this(text: js.String) = this()

src/main/scala/scala/scalajs/js/Svg.scala renamed to src/main/scala/org/scalajs/dom/Svg.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package scala.scalajs
2-
package js
1+
package org.scalajs.dom
2+
3+
import scala.scalajs.js
34

45
trait GetSVGDocument extends js.Object {
56
def getSVGDocument(): Document = ???

src/main/scala/scala/scalajs/extensions/Extensions.scala renamed to src/main/scala/org/scalajs/dom/extensions/Extensions.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package scala.scalajs.extensions
1+
package org.scalajs.dom.extensions
22

33
import scala.scalajs.js
44

@@ -112,4 +112,4 @@ object KeyCode{
112112
val x = 88
113113
val y = 89
114114
val z = 90
115-
}
115+
}

src/main/scala/scala/scalajs/extensions/package.scala renamed to src/main/scala/org/scalajs/dom/extensions/package.scala

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
package scala.scalajs
1+
package org.scalajs.dom
22

3-
import scala.scalajs.js.CanvasRenderingContext2D
3+
import scala.scalajs.js
4+
import org.scalajs.dom
45

56
package object extensions {
6-
implicit class PimpedNodeList(nodes: js.NodeList) extends EasySeq[js.Node](nodes.length, nodes.apply)
7-
implicit class PimpedTouchList(nodes: js.TouchList) extends EasySeq[js.TouchEvent](nodes.length, nodes.apply)
8-
implicit class PimpedHtmlCollection(coll: js.HTMLCollection) extends EasySeq[js.Element](coll.length, coll.apply)
9-
implicit class PimpedSVGTransformList(coll: js.SVGTransformList) extends EasySeq[js.SVGTransform](coll.numberOfItems, coll.getItem)
7+
implicit class PimpedNodeList(nodes: dom.NodeList) extends EasySeq[dom.Node](nodes.length, nodes.apply)
8+
implicit class PimpedTouchList(nodes: dom.TouchList) extends EasySeq[dom.TouchEvent](nodes.length, nodes.apply)
9+
implicit class PimpedHtmlCollection(coll: dom.HTMLCollection) extends EasySeq[dom.Element](coll.length, coll.apply)
10+
implicit class PimpedSVGTransformList(coll: dom.SVGTransformList) extends EasySeq[dom.SVGTransform](coll.numberOfItems, coll.getItem)
1011
implicit class Castable(x: js.Dynamic){
1112
def to[T] = x.asInstanceOf[T]
1213
}

src/main/scala/scala/scalajs/js/lib.scala renamed to src/main/scala/org/scalajs/dom/lib.scala

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
package scala.scalajs
1+
package org.scalajs
22

3-
package js {
3+
import scala.scalajs.js
4+
5+
package dom {
46

57
trait PositionOptions extends js.Object {
68
var enableHighAccuracy: js.Boolean = _
@@ -279,7 +281,7 @@ object MouseEvent extends js.Object {
279281
trait RangeException extends js.Object {
280282
var code: js.Number = _
281283
var message: js.String = _
282-
284+
283285
var INVALID_NODE_TYPE_ERR: js.Number = _
284286
var BAD_BOUNDARYPOINTS_ERR: js.Number = _
285287
var name: js.String = _
@@ -384,7 +386,7 @@ trait Selection extends js.Object {
384386
var rangeCount: js.Number = _
385387
def addRange(range: Range): Unit = ???
386388
def collapseToEnd(): Unit = ???
387-
389+
388390
def selectAllChildren(parentNode: Node): Unit = ???
389391
def getRangeAt(index: js.Number): Range = ???
390392
def collapse(parentNode: Node, offset: js.Number): Unit = ???
@@ -552,7 +554,7 @@ trait Window extends EventTarget with MSEventAttachmentTarget with WindowLocalSt
552554
def prompt(message: js.String, defaul: js.String): js.String = ???
553555
def prompt(message: js.String): js.String = ???
554556
def prompt(): js.String = ???
555-
557+
556558
def open(url: js.String, target: js.String, features: js.String, replace: js.Boolean): Window = ???
557559
def open(url: js.String, target: js.String, features: js.String): Window = ???
558560
def open(url: js.String, target: js.String): Window = ???
@@ -1130,7 +1132,7 @@ trait Range extends js.Object {
11301132
def selectNode(refNode: Node): Unit = ???
11311133
def detach(): Unit = ???
11321134
def getBoundingClientRect(): ClientRect = ???
1133-
1135+
11341136
def compareBoundaryPoints(how: js.Number, sourceRange: Range): js.Number = ???
11351137
def insertNode(newNode: Node): Unit = ???
11361138
def collapse(toStart: js.Boolean): Unit = ???
@@ -1268,7 +1270,7 @@ object PerformanceTiming extends js.Object {
12681270
trait EventException extends js.Object {
12691271
var code: js.Number = _
12701272
var message: js.String = _
1271-
1273+
12721274
var DISPATCH_REQUEST_ERR: js.Number = _
12731275
var UNSPECIFIED_EVENT_TYPE_ERR: js.Number = _
12741276
var name: js.String = _
@@ -1338,7 +1340,7 @@ trait Location extends js.Object {
13381340
def reload(): Unit = ???
13391341
def replace(url: js.String): Unit = ???
13401342
def assign(url: js.String): Unit = ???
1341-
1343+
13421344
}
13431345

13441346
object Location extends js.Object {
@@ -1399,7 +1401,7 @@ object Text extends js.Object {
13991401
trait PositionError extends js.Object {
14001402
var code: js.Number = _
14011403
var message: js.String = _
1402-
1404+
14031405
var POSITION_UNAVAILABLE: js.Number = _
14041406
var PERMISSION_DENIED: js.Number = _
14051407
var TIMEOUT: js.Number = _
@@ -1560,7 +1562,7 @@ trait MediaList extends js.Object {
15601562
def apply(index: js.Number): js.String = ???
15611563
@scala.scalajs.js.annotation.JSBracketAccess
15621564
def update(index: js.Number, v: js.String): Unit = ???
1563-
1565+
15641566
}
15651567

15661568
object MediaList extends js.Object {
@@ -1681,7 +1683,7 @@ trait NodeListOf[TNode <: Node] extends NodeList {
16811683
override def item(index: js.Number): TNode = ???
16821684
@scala.scalajs.js.annotation.JSBracketAccess
16831685
override def apply(index: js.Number): TNode = ???
1684-
1686+
16851687
}
16861688

16871689
class XMLSerializer extends js.Object {
@@ -1819,7 +1821,7 @@ object CharacterData extends js.Object {
18191821
trait DOMException extends js.Object {
18201822
var code: js.Number = _
18211823
var message: js.String = _
1822-
1824+
18231825
var HIERARCHY_REQUEST_ERR: js.Number = _
18241826
var NO_MODIFICATION_ALLOWED_ERR: js.Number = _
18251827
var INVALID_MODIFICATION_ERR: js.Number = _
@@ -2004,7 +2006,7 @@ trait DOMTokenList extends js.Object {
20042006
def apply(index: js.Number): js.String = ???
20052007
@scala.scalajs.js.annotation.JSBracketAccess
20062008
def update(index: js.Number, v: js.String): Unit = ???
2007-
2009+
20082010
}
20092011

20102012
object DOMTokenList extends js.Object {
@@ -2047,7 +2049,7 @@ object MediaQueryList extends js.Object {
20472049

20482050
trait DOMError extends js.Object {
20492051
var name: js.String = _
2050-
2052+
20512053
}
20522054

20532055
object DOMError extends js.Object {
@@ -2471,7 +2473,8 @@ object Worker extends js.Object {
24712473
}
24722474

24732475
}
2474-
package js{
2476+
2477+
package dom {
24752478
object globals extends js.GlobalScope {
24762479
def parseInt(string: js.String, radix: js.Number): js.Number = ???
24772480
def parseFloat(string: js.String, radix: js.Number): js.Number = ???
@@ -2684,4 +2687,4 @@ package js{
26842687
var indexedDB: IDBFactory = _
26852688
var console: Console = _
26862689
}
2687-
}
2690+
}

0 commit comments

Comments
 (0)