From 800b1d9323a2cb3b7366519e26e0d1a36098d33a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Tue, 19 Nov 2013 14:11:03 +0100 Subject: [PATCH 1/2] Official publishing configuration. --- build.sbt | 8 ++++++-- project/build.sbt | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 04c14c666..f02384a43 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,9 @@ scalaJSSettings -name := "Dom" +name := "Scala.js DOM" -version := "0.1-SNAPSHOT" \ No newline at end of file +normalizedName := "scalajs-dom" + +version := "0.1-SNAPSHOT" + +organization := "org.scala-lang.modules.scalajs" diff --git a/project/build.sbt b/project/build.sbt index 26f450ea6..793d3a101 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1,5 +1,6 @@ +resolvers += Resolver.url("scala-js-snapshots", + url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns) + addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.1-SNAPSHOT") addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.1") - - From a73c2b41db0624af600416fa2204e48ca5ab19d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Tue, 19 Nov 2013 13:58:07 +0100 Subject: [PATCH 2/2] Move packages around for official publication. DOM definitions go to org.scalajs.dom. Extensions go to org.scalajs.dom.extensions. --- .../scalajs/js => org/scalajs/dom}/Css.scala | 7 ++-- .../scalajs/js => org/scalajs/dom}/Html.scala | 5 +-- .../scalajs/js => org/scalajs/dom}/Idb.scala | 5 +-- .../scalajs/js => org/scalajs/dom}/Ms.scala | 5 +-- .../scalajs/js => org/scalajs/dom}/Svg.scala | 5 +-- .../scalajs/dom}/extensions/Extensions.scala | 4 +-- .../scalajs/dom}/extensions/package.scala | 13 +++---- .../scalajs/js => org/scalajs/dom}/lib.scala | 35 ++++++++++--------- 8 files changed, 44 insertions(+), 35 deletions(-) rename src/main/scala/{scala/scalajs/js => org/scalajs/dom}/Css.scala (99%) rename src/main/scala/{scala/scalajs/js => org/scalajs/dom}/Html.scala (99%) rename src/main/scala/{scala/scalajs/js => org/scalajs/dom}/Idb.scala (99%) rename src/main/scala/{scala/scalajs/js => org/scalajs/dom}/Ms.scala (99%) rename src/main/scala/{scala/scalajs/js => org/scalajs/dom}/Svg.scala (99%) rename src/main/scala/{scala/scalajs => org/scalajs/dom}/extensions/Extensions.scala (98%) rename src/main/scala/{scala/scalajs => org/scalajs/dom}/extensions/package.scala (66%) rename src/main/scala/{scala/scalajs/js => org/scalajs/dom}/lib.scala (99%) diff --git a/src/main/scala/scala/scalajs/js/Css.scala b/src/main/scala/org/scalajs/dom/Css.scala similarity index 99% rename from src/main/scala/scala/scalajs/js/Css.scala rename to src/main/scala/org/scalajs/dom/Css.scala index bd72cc17d..9b80e3fa4 100644 --- a/src/main/scala/scala/scalajs/js/Css.scala +++ b/src/main/scala/org/scalajs/dom/Css.scala @@ -1,5 +1,6 @@ -package scala.scalajs -package js +package org.scalajs.dom + +import scala.scalajs.js trait CSSStyleDeclaration extends js.Object { var backgroundAttachment: js.String = _ @@ -439,4 +440,4 @@ trait CSSKeyframeRule extends CSSRule { object CSSKeyframeRule extends js.Object { /* ??? ConstructorMember(FunSignature(List(),List(),Some(TypeRef(TypeName(CSSKeyframeRule),List())))) */ -} \ No newline at end of file +} diff --git a/src/main/scala/scala/scalajs/js/Html.scala b/src/main/scala/org/scalajs/dom/Html.scala similarity index 99% rename from src/main/scala/scala/scalajs/js/Html.scala rename to src/main/scala/org/scalajs/dom/Html.scala index 3d4e9f7f3..ce7850fc7 100644 --- a/src/main/scala/scala/scalajs/js/Html.scala +++ b/src/main/scala/org/scalajs/dom/Html.scala @@ -1,5 +1,6 @@ -package scala.scalajs -package js +package org.scalajs.dom + +import scala.scalajs.js trait HTMLTableElement extends HTMLElement with MSDataBindingTableExtensions with MSDataBindingExtensions { var width: js.String = _ diff --git a/src/main/scala/scala/scalajs/js/Idb.scala b/src/main/scala/org/scalajs/dom/Idb.scala similarity index 99% rename from src/main/scala/scala/scalajs/js/Idb.scala rename to src/main/scala/org/scalajs/dom/Idb.scala index 369f4ba21..8ca076cf8 100644 --- a/src/main/scala/scala/scalajs/js/Idb.scala +++ b/src/main/scala/org/scalajs/dom/Idb.scala @@ -1,5 +1,6 @@ -package scala.scalajs -package js +package org.scalajs.dom + +import scala.scalajs.js trait IDBObjectStore extends js.Object { var indexNames: DOMStringList = _ diff --git a/src/main/scala/scala/scalajs/js/Ms.scala b/src/main/scala/org/scalajs/dom/Ms.scala similarity index 99% rename from src/main/scala/scala/scalajs/js/Ms.scala rename to src/main/scala/org/scalajs/dom/Ms.scala index e635e0a95..d371d2d36 100644 --- a/src/main/scala/scala/scalajs/js/Ms.scala +++ b/src/main/scala/org/scalajs/dom/Ms.scala @@ -1,5 +1,6 @@ -package scala.scalajs -package js +package org.scalajs.dom + +import scala.scalajs.js class MSCSSMatrix extends js.Object { def this(text: js.String) = this() diff --git a/src/main/scala/scala/scalajs/js/Svg.scala b/src/main/scala/org/scalajs/dom/Svg.scala similarity index 99% rename from src/main/scala/scala/scalajs/js/Svg.scala rename to src/main/scala/org/scalajs/dom/Svg.scala index eaf0acc6a..83653f2d8 100644 --- a/src/main/scala/scala/scalajs/js/Svg.scala +++ b/src/main/scala/org/scalajs/dom/Svg.scala @@ -1,5 +1,6 @@ -package scala.scalajs -package js +package org.scalajs.dom + +import scala.scalajs.js trait GetSVGDocument extends js.Object { def getSVGDocument(): Document = ??? diff --git a/src/main/scala/scala/scalajs/extensions/Extensions.scala b/src/main/scala/org/scalajs/dom/extensions/Extensions.scala similarity index 98% rename from src/main/scala/scala/scalajs/extensions/Extensions.scala rename to src/main/scala/org/scalajs/dom/extensions/Extensions.scala index f9e2eb529..d0d3c39f2 100644 --- a/src/main/scala/scala/scalajs/extensions/Extensions.scala +++ b/src/main/scala/org/scalajs/dom/extensions/Extensions.scala @@ -1,4 +1,4 @@ -package scala.scalajs.extensions +package org.scalajs.dom.extensions import scala.scalajs.js @@ -112,4 +112,4 @@ object KeyCode{ val x = 88 val y = 89 val z = 90 -} \ No newline at end of file +} diff --git a/src/main/scala/scala/scalajs/extensions/package.scala b/src/main/scala/org/scalajs/dom/extensions/package.scala similarity index 66% rename from src/main/scala/scala/scalajs/extensions/package.scala rename to src/main/scala/org/scalajs/dom/extensions/package.scala index 62959f89e..351540a9c 100644 --- a/src/main/scala/scala/scalajs/extensions/package.scala +++ b/src/main/scala/org/scalajs/dom/extensions/package.scala @@ -1,12 +1,13 @@ -package scala.scalajs +package org.scalajs.dom -import scala.scalajs.js.CanvasRenderingContext2D +import scala.scalajs.js +import org.scalajs.dom package object extensions { - implicit class PimpedNodeList(nodes: js.NodeList) extends EasySeq[js.Node](nodes.length, nodes.apply) - implicit class PimpedTouchList(nodes: js.TouchList) extends EasySeq[js.TouchEvent](nodes.length, nodes.apply) - implicit class PimpedHtmlCollection(coll: js.HTMLCollection) extends EasySeq[js.Element](coll.length, coll.apply) - implicit class PimpedSVGTransformList(coll: js.SVGTransformList) extends EasySeq[js.SVGTransform](coll.numberOfItems, coll.getItem) + implicit class PimpedNodeList(nodes: dom.NodeList) extends EasySeq[dom.Node](nodes.length, nodes.apply) + implicit class PimpedTouchList(nodes: dom.TouchList) extends EasySeq[dom.TouchEvent](nodes.length, nodes.apply) + implicit class PimpedHtmlCollection(coll: dom.HTMLCollection) extends EasySeq[dom.Element](coll.length, coll.apply) + implicit class PimpedSVGTransformList(coll: dom.SVGTransformList) extends EasySeq[dom.SVGTransform](coll.numberOfItems, coll.getItem) implicit class Castable(x: js.Dynamic){ def to[T] = x.asInstanceOf[T] } diff --git a/src/main/scala/scala/scalajs/js/lib.scala b/src/main/scala/org/scalajs/dom/lib.scala similarity index 99% rename from src/main/scala/scala/scalajs/js/lib.scala rename to src/main/scala/org/scalajs/dom/lib.scala index 4402d0c41..68679ef4f 100644 --- a/src/main/scala/scala/scalajs/js/lib.scala +++ b/src/main/scala/org/scalajs/dom/lib.scala @@ -1,6 +1,8 @@ -package scala.scalajs +package org.scalajs -package js { +import scala.scalajs.js + +package dom { trait PositionOptions extends js.Object { var enableHighAccuracy: js.Boolean = _ @@ -279,7 +281,7 @@ object MouseEvent extends js.Object { trait RangeException extends js.Object { var code: js.Number = _ var message: js.String = _ - + var INVALID_NODE_TYPE_ERR: js.Number = _ var BAD_BOUNDARYPOINTS_ERR: js.Number = _ var name: js.String = _ @@ -384,7 +386,7 @@ trait Selection extends js.Object { var rangeCount: js.Number = _ def addRange(range: Range): Unit = ??? def collapseToEnd(): Unit = ??? - + def selectAllChildren(parentNode: Node): Unit = ??? def getRangeAt(index: js.Number): Range = ??? def collapse(parentNode: Node, offset: js.Number): Unit = ??? @@ -552,7 +554,7 @@ trait Window extends EventTarget with MSEventAttachmentTarget with WindowLocalSt def prompt(message: js.String, defaul: js.String): js.String = ??? def prompt(message: js.String): js.String = ??? def prompt(): js.String = ??? - + def open(url: js.String, target: js.String, features: js.String, replace: js.Boolean): Window = ??? def open(url: js.String, target: js.String, features: js.String): Window = ??? def open(url: js.String, target: js.String): Window = ??? @@ -1130,7 +1132,7 @@ trait Range extends js.Object { def selectNode(refNode: Node): Unit = ??? def detach(): Unit = ??? def getBoundingClientRect(): ClientRect = ??? - + def compareBoundaryPoints(how: js.Number, sourceRange: Range): js.Number = ??? def insertNode(newNode: Node): Unit = ??? def collapse(toStart: js.Boolean): Unit = ??? @@ -1268,7 +1270,7 @@ object PerformanceTiming extends js.Object { trait EventException extends js.Object { var code: js.Number = _ var message: js.String = _ - + var DISPATCH_REQUEST_ERR: js.Number = _ var UNSPECIFIED_EVENT_TYPE_ERR: js.Number = _ var name: js.String = _ @@ -1338,7 +1340,7 @@ trait Location extends js.Object { def reload(): Unit = ??? def replace(url: js.String): Unit = ??? def assign(url: js.String): Unit = ??? - + } object Location extends js.Object { @@ -1399,7 +1401,7 @@ object Text extends js.Object { trait PositionError extends js.Object { var code: js.Number = _ var message: js.String = _ - + var POSITION_UNAVAILABLE: js.Number = _ var PERMISSION_DENIED: js.Number = _ var TIMEOUT: js.Number = _ @@ -1560,7 +1562,7 @@ trait MediaList extends js.Object { def apply(index: js.Number): js.String = ??? @scala.scalajs.js.annotation.JSBracketAccess def update(index: js.Number, v: js.String): Unit = ??? - + } object MediaList extends js.Object { @@ -1681,7 +1683,7 @@ trait NodeListOf[TNode <: Node] extends NodeList { override def item(index: js.Number): TNode = ??? @scala.scalajs.js.annotation.JSBracketAccess override def apply(index: js.Number): TNode = ??? - + } class XMLSerializer extends js.Object { @@ -1819,7 +1821,7 @@ object CharacterData extends js.Object { trait DOMException extends js.Object { var code: js.Number = _ var message: js.String = _ - + var HIERARCHY_REQUEST_ERR: js.Number = _ var NO_MODIFICATION_ALLOWED_ERR: js.Number = _ var INVALID_MODIFICATION_ERR: js.Number = _ @@ -2004,7 +2006,7 @@ trait DOMTokenList extends js.Object { def apply(index: js.Number): js.String = ??? @scala.scalajs.js.annotation.JSBracketAccess def update(index: js.Number, v: js.String): Unit = ??? - + } object DOMTokenList extends js.Object { @@ -2047,7 +2049,7 @@ object MediaQueryList extends js.Object { trait DOMError extends js.Object { var name: js.String = _ - + } object DOMError extends js.Object { @@ -2471,7 +2473,8 @@ object Worker extends js.Object { } } -package js{ + +package dom { object globals extends js.GlobalScope { def parseInt(string: js.String, radix: js.Number): js.Number = ??? def parseFloat(string: js.String, radix: js.Number): js.Number = ??? @@ -2684,4 +2687,4 @@ package js{ var indexedDB: IDBFactory = _ var console: Console = _ } -} \ No newline at end of file +}