Skip to content

Commit cad0bbb

Browse files
lihaoyilihaoyi
committed
updated to latest master and package layout
1 parent 7b7898e commit cad0bbb

File tree

7 files changed

+64
-58
lines changed

7 files changed

+64
-58
lines changed

‎project/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
addSbtPlugin("ch.epfl.lamp" % "scalajs-sbt-plugin" % "0.1-SNAPSHOT")
1+
addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.1-SNAPSHOT")
22

33
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.1")
44

‎src/main/scala/scala/js/Css.scala

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

34
trait CSSStyleDeclaration extends js.Object {
45
var backgroundAttachment: js.String = _
@@ -157,9 +158,9 @@ trait CSSStyleDeclaration extends js.Object {
157158
def getPropertyValue(propertyName: js.String): js.String = ???
158159
def removeProperty(propertyName: js.String): js.String = ???
159160
def item(index: js.Number): js.String = ???
160-
@scala.js.annotation.JSBracketAccess
161+
@scala.scalajs.js.annotation.JSBracketAccess
161162
def apply(index: js.Number): js.String = ???
162-
@scala.js.annotation.JSBracketAccess
163+
@scala.scalajs.js.annotation.JSBracketAccess
163164
def update(index: js.Number, v: js.String): Unit = ???
164165
def setProperty(propertyName: js.String, value: js.String, priority: js.String): Unit = ???
165166
def setProperty(propertyName: js.String, value: js.String): Unit = ???
@@ -409,9 +410,9 @@ object CSSPageRule extends js.Object {
409410
trait CSSRuleList extends js.Object {
410411
var length: js.Number = _
411412
def item(index: js.Number): CSSRule = ???
412-
@scala.js.annotation.JSBracketAccess
413+
@scala.scalajs.js.annotation.JSBracketAccess
413414
def apply(index: js.Number): CSSRule = ???
414-
@scala.js.annotation.JSBracketAccess
415+
@scala.scalajs.js.annotation.JSBracketAccess
415416
def update(index: js.Number, v: CSSRule): Unit = ???
416417
}
417418

‎src/main/scala/scala/js/Html.scala

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
package scala.js
1+
package scala.scalajs
2+
package js
23

34
trait HTMLTableElement extends HTMLElement with MSDataBindingTableExtensions with MSDataBindingExtensions {
45
var width: js.String = _
@@ -135,9 +136,9 @@ trait HTMLSelectElement extends HTMLElement with MSHTMLCollectionExtensions with
135136
def item(name: js.Any): js.Dynamic = ???
136137
def item(): js.Dynamic = ???
137138
def namedItem(name: js.String): js.Dynamic = ???
138-
@scala.js.annotation.JSBracketAccess
139+
@scala.scalajs.js.annotation.JSBracketAccess
139140
def apply(name: js.String): js.Any = ???
140-
@scala.js.annotation.JSBracketAccess
141+
@scala.scalajs.js.annotation.JSBracketAccess
141142
def update(name: js.String, v: js.Any): Unit = ???
142143
var validationMessage: js.String = _
143144
var autofocus: js.Boolean = _
@@ -252,9 +253,9 @@ trait HTMLCollection extends MSHTMLCollectionExtensions {
252253
def item(nameOrIndex: js.Any): Element = ???
253254
def item(): Element = ???
254255
def namedItem(name: js.String): Element = ???
255-
@scala.js.annotation.JSBracketAccess
256+
@scala.scalajs.js.annotation.JSBracketAccess
256257
def apply(name: js.Number): Element = ???
257-
@scala.js.annotation.JSBracketAccess
258+
@scala.scalajs.js.annotation.JSBracketAccess
258259
def update(name: js.Number, v: Element): Unit = ???
259260
}
260261

@@ -1320,9 +1321,9 @@ trait HTMLFormElement extends HTMLElement with MSHTMLCollectionExtensions {
13201321
def item(): js.Dynamic = ???
13211322
def submit(): Unit = ???
13221323
def namedItem(name: js.String): js.Dynamic = ???
1323-
@scala.js.annotation.JSBracketAccess
1324+
@scala.scalajs.js.annotation.JSBracketAccess
13241325
def apply(name: js.String): js.Any = ???
1325-
@scala.js.annotation.JSBracketAccess
1326+
@scala.scalajs.js.annotation.JSBracketAccess
13261327
def update(name: js.String, v: js.Any): Unit = ???
13271328
var autocomplete: js.String = _
13281329
var noValidate: js.Boolean = _

‎src/main/scala/scala/js/Idb.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
package scala.js
1+
package scala.scalajs
2+
package js
23

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

‎src/main/scala/scala/js/Ms.scala

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
package scala.js
1+
package scala.scalajs
2+
package js
23

34
class MSCSSMatrix extends js.Object {
45
def this(text: js.String) = this()
@@ -144,9 +145,9 @@ trait MSUnsafeFunctionCallback extends js.Object {
144145
trait MSRangeCollection extends js.Object {
145146
var length: js.Number = _
146147
def item(index: js.Number): Range = ???
147-
@scala.js.annotation.JSBracketAccess
148+
@scala.scalajs.js.annotation.JSBracketAccess
148149
def apply(index: js.Number): Range = ???
149-
@scala.js.annotation.JSBracketAccess
150+
@scala.scalajs.js.annotation.JSBracketAccess
150151
def update(index: js.Number, v: Range): Unit = ???
151152
}
152153

@@ -350,9 +351,9 @@ trait MSCSSRuleList extends js.Object {
350351
var length: js.Number = _
351352
def item(index: js.Number): CSSStyleRule = ???
352353
def item(): CSSStyleRule = ???
353-
@scala.js.annotation.JSBracketAccess
354+
@scala.scalajs.js.annotation.JSBracketAccess
354355
def apply(index: js.Number): CSSStyleRule = ???
355-
@scala.js.annotation.JSBracketAccess
356+
@scala.scalajs.js.annotation.JSBracketAccess
356357
def update(index: js.Number, v: CSSStyleRule): Unit = ???
357358
}
358359

@@ -441,9 +442,9 @@ trait MSNamespaceInfoCollection extends js.Object {
441442
def add(namespace: js.String): Object = ???
442443
def add(): Object = ???
443444
def item(index: js.Any): Object = ???
444-
@scala.js.annotation.JSBracketAccess
445+
@scala.scalajs.js.annotation.JSBracketAccess
445446
def apply(index: js.String): Object = ???
446-
@scala.js.annotation.JSBracketAccess
447+
@scala.scalajs.js.annotation.JSBracketAccess
447448
def update(index: js.String, v: Object): Unit = ???
448449
}
449450

‎src/main/scala/scala/js/Svg.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
package scala.js
1+
package scala.scalajs
2+
package js
23

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

‎src/main/scala/scala/js/lib.scala

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
package scala
1+
package scala.scalajs
2+
23
package js {
34

45
trait PositionOptions extends js.Object {
@@ -420,9 +421,9 @@ trait ControlRangeCollection extends js.Object {
420421
def scrollIntoView(varargStart: js.Any): Unit = ???
421422
def scrollIntoView(): Unit = ???
422423
def item(index: js.Number): Element = ???
423-
@scala.js.annotation.JSBracketAccess
424+
@scala.scalajs.js.annotation.JSBracketAccess
424425
def apply(index: js.Number): Element = ???
425-
@scala.js.annotation.JSBracketAccess
426+
@scala.scalajs.js.annotation.JSBracketAccess
426427
def update(index: js.Number, v: Element): Unit = ???
427428
def execCommand(cmdID: js.String, showUI: js.Boolean, value: js.Any): js.Boolean = ???
428429
def execCommand(cmdID: js.String, showUI: js.Boolean): js.Boolean = ???
@@ -609,9 +610,9 @@ object Window extends js.Object {
609610
trait StyleSheetPageList extends js.Object {
610611
var length: js.Number = _
611612
def item(index: js.Number): CSSPageRule = ???
612-
@scala.js.annotation.JSBracketAccess
613+
@scala.scalajs.js.annotation.JSBracketAccess
613614
def apply(index: js.Number): CSSPageRule = ???
614-
@scala.js.annotation.JSBracketAccess
615+
@scala.scalajs.js.annotation.JSBracketAccess
615616
def update(index: js.Number, v: CSSPageRule): Unit = ???
616617
}
617618

@@ -1140,17 +1141,17 @@ object Range extends js.Object {
11401141
trait Storage extends MSStorageExtensions {
11411142
var length: js.Number = _
11421143
def getItem(key: js.String): js.Dynamic = ???
1143-
@scala.js.annotation.JSBracketAccess
1144+
@scala.scalajs.js.annotation.JSBracketAccess
11441145
def apply(key: js.String): js.Any = ???
1145-
@scala.js.annotation.JSBracketAccess
1146+
@scala.scalajs.js.annotation.JSBracketAccess
11461147
def update(key: js.String, v: js.Any): Unit = ???
11471148
def setItem(key: js.String, data: js.String): Unit = ???
11481149
def clear(): Unit = ???
11491150
def removeItem(key: js.String): Unit = ???
11501151
def key(index: js.Number): js.String = ???
1151-
@scala.js.annotation.JSBracketAccess
1152+
@scala.scalajs.js.annotation.JSBracketAccess
11521153
def apply(index: js.Number): js.Any = ???
1153-
@scala.js.annotation.JSBracketAccess
1154+
@scala.scalajs.js.annotation.JSBracketAccess
11541155
def update(index: js.Number, v: js.Any): Unit = ???
11551156
}
11561157

@@ -1161,9 +1162,9 @@ object Storage extends js.Object {
11611162
trait TextRangeCollection extends js.Object {
11621163
var length: js.Number = _
11631164
def item(index: js.Number): TextRange = ???
1164-
@scala.js.annotation.JSBracketAccess
1165+
@scala.scalajs.js.annotation.JSBracketAccess
11651166
def apply(index: js.Number): TextRange = ???
1166-
@scala.js.annotation.JSBracketAccess
1167+
@scala.scalajs.js.annotation.JSBracketAccess
11671168
def update(index: js.Number, v: TextRange): Unit = ???
11681169
}
11691170

@@ -1394,9 +1395,9 @@ trait StyleSheetList extends js.Object {
13941395
var length: js.Number = _
13951396
def item(index: js.Number): StyleSheet = ???
13961397
def item(): StyleSheet = ???
1397-
@scala.js.annotation.JSBracketAccess
1398+
@scala.scalajs.js.annotation.JSBracketAccess
13981399
def apply(index: js.Number): StyleSheet = ???
1399-
@scala.js.annotation.JSBracketAccess
1400+
@scala.scalajs.js.annotation.JSBracketAccess
14001401
def update(index: js.Number, v: StyleSheet): Unit = ???
14011402
}
14021403

@@ -1513,9 +1514,9 @@ trait NamedNodeMap extends js.Object {
15131514
var length: js.Number = _
15141515
def removeNamedItemNS(namespaceURI: js.String, localName: js.String): Attr = ???
15151516
def item(index: js.Number): Attr = ???
1516-
@scala.js.annotation.JSBracketAccess
1517+
@scala.scalajs.js.annotation.JSBracketAccess
15171518
def apply(index: js.Number): Attr = ???
1518-
@scala.js.annotation.JSBracketAccess
1519+
@scala.scalajs.js.annotation.JSBracketAccess
15191520
def update(index: js.Number, v: Attr): Unit = ???
15201521
def removeNamedItem(name: js.String): Attr = ???
15211522
def getNamedItem(name: js.String): Attr = ???
@@ -1534,9 +1535,9 @@ trait MediaList extends js.Object {
15341535
def deleteMedium(oldMedium: js.String): Unit = ???
15351536
def appendMedium(newMedium: js.String): Unit = ???
15361537
def item(index: js.Number): js.String = ???
1537-
@scala.js.annotation.JSBracketAccess
1538+
@scala.scalajs.js.annotation.JSBracketAccess
15381539
def apply(index: js.Number): js.String = ???
1539-
@scala.js.annotation.JSBracketAccess
1540+
@scala.scalajs.js.annotation.JSBracketAccess
15401541
def update(index: js.Number, v: js.String): Unit = ???
15411542

15421543
}
@@ -1604,9 +1605,9 @@ object Position extends js.Object {
16041605
trait BookmarkCollection extends js.Object {
16051606
var length: js.Number = _
16061607
def item(index: js.Number): js.Dynamic = ???
1607-
@scala.js.annotation.JSBracketAccess
1608+
@scala.scalajs.js.annotation.JSBracketAccess
16081609
def apply(index: js.Number): js.Any = ???
1609-
@scala.js.annotation.JSBracketAccess
1610+
@scala.scalajs.js.annotation.JSBracketAccess
16101611
def update(index: js.Number, v: js.Any): Unit = ???
16111612
}
16121613

@@ -1645,9 +1646,9 @@ class StyleSheet extends js.Object {
16451646
trait NodeList extends js.Object {
16461647
var length: js.Number = _
16471648
def item(index: js.Number): Node = ???
1648-
@scala.js.annotation.JSBracketAccess
1649+
@scala.scalajs.js.annotation.JSBracketAccess
16491650
def apply(index: js.Number): Node = ???
1650-
@scala.js.annotation.JSBracketAccess
1651+
@scala.scalajs.js.annotation.JSBracketAccess
16511652
def update(index: js.Number, v: Node): Unit = ???
16521653
}
16531654

@@ -1657,7 +1658,7 @@ object NodeList extends js.Object {
16571658

16581659
trait NodeListOf[TNode <: Node] extends NodeList {
16591660
override def item(index: js.Number): TNode = ???
1660-
@scala.js.annotation.JSBracketAccess
1661+
@scala.scalajs.js.annotation.JSBracketAccess
16611662
override def apply(index: js.Number): TNode = ???
16621663

16631664
}
@@ -1898,9 +1899,9 @@ trait LinkStyle extends js.Object {
18981899
trait ClientRectList extends js.Object {
18991900
var length: js.Number = _
19001901
def item(index: js.Number): ClientRect = ???
1901-
@scala.js.annotation.JSBracketAccess
1902+
@scala.scalajs.js.annotation.JSBracketAccess
19021903
def apply(index: js.Number): ClientRect = ???
1903-
@scala.js.annotation.JSBracketAccess
1904+
@scala.scalajs.js.annotation.JSBracketAccess
19041905
def update(index: js.Number, v: ClientRect): Unit = ???
19051906
}
19061907

@@ -1977,9 +1978,9 @@ trait DOMTokenList extends js.Object {
19771978
def toggle(token: js.String): js.Boolean = ???
19781979
def add(token: js.String): Unit = ???
19791980
def item(index: js.Number): js.String = ???
1980-
@scala.js.annotation.JSBracketAccess
1981+
@scala.scalajs.js.annotation.JSBracketAccess
19811982
def apply(index: js.Number): js.String = ???
1982-
@scala.js.annotation.JSBracketAccess
1983+
@scala.scalajs.js.annotation.JSBracketAccess
19831984
def update(index: js.Number, v: js.String): Unit = ???
19841985

19851986
}
@@ -2090,9 +2091,9 @@ object ProgressEvent extends js.Object {
20902091
trait FileList extends js.Object {
20912092
var length: js.Number = _
20922093
def item(index: js.Number): File = ???
2093-
@scala.js.annotation.JSBracketAccess
2094+
@scala.scalajs.js.annotation.JSBracketAccess
20942095
def apply(index: js.Number): File = ???
2095-
@scala.js.annotation.JSBracketAccess
2096+
@scala.scalajs.js.annotation.JSBracketAccess
20962097
def update(index: js.Number, v: File): Unit = ???
20972098
}
20982099

@@ -2141,9 +2142,9 @@ trait AudioTrackList extends EventTarget {
21412142
var onaddtrack: js.Function1[TrackEvent, js.Any] = _
21422143
def getTrackById(id: js.String): AudioTrack = ???
21432144
def item(index: js.Number): AudioTrack = ???
2144-
@scala.js.annotation.JSBracketAccess
2145+
@scala.scalajs.js.annotation.JSBracketAccess
21452146
def apply(index: js.Number): AudioTrack = ???
2146-
@scala.js.annotation.JSBracketAccess
2147+
@scala.scalajs.js.annotation.JSBracketAccess
21472148
def update(index: js.Number, v: AudioTrack): Unit = ???
21482149
override def addEventListener(`type`: js.String, listener: js.Function1[Event, Unit], useCapture: js.Boolean): Unit = ???
21492150
override def addEventListener(`type`: js.String, listener: js.Function1[Event, Unit]): Unit = ???
@@ -2194,9 +2195,9 @@ object AudioTrack extends js.Object {
21942195
trait TextTrackCueList extends js.Object {
21952196
var length: js.Number = _
21962197
def item(index: js.Number): TextTrackCue = ???
2197-
@scala.js.annotation.JSBracketAccess
2198+
@scala.scalajs.js.annotation.JSBracketAccess
21982199
def apply(index: js.Number): TextTrackCue = ???
2199-
@scala.js.annotation.JSBracketAccess
2200+
@scala.scalajs.js.annotation.JSBracketAccess
22002201
def update(index: js.Number, v: TextTrackCue): Unit = ???
22012202
def getCueById(id: js.String): TextTrackCue = ???
22022203
}
@@ -2208,9 +2209,9 @@ object TextTrackCueList extends js.Object {
22082209
trait TextTrackList extends js.Object {
22092210
var length: js.Number = _
22102211
def item(index: js.Number): TextTrack = ???
2211-
@scala.js.annotation.JSBracketAccess
2212+
@scala.scalajs.js.annotation.JSBracketAccess
22122213
def apply(index: js.Number): TextTrack = ???
2213-
@scala.js.annotation.JSBracketAccess
2214+
@scala.scalajs.js.annotation.JSBracketAccess
22142215
def update(index: js.Number, v: TextTrack): Unit = ???
22152216
}
22162217

@@ -2246,9 +2247,9 @@ trait DOMStringList extends js.Object {
22462247
var length: js.Number = _
22472248
def contains(str: js.String): js.Boolean = ???
22482249
def item(index: js.Number): js.String = ???
2249-
@scala.js.annotation.JSBracketAccess
2250+
@scala.scalajs.js.annotation.JSBracketAccess
22502251
def apply(index: js.Number): js.String = ???
2251-
@scala.js.annotation.JSBracketAccess
2252+
@scala.scalajs.js.annotation.JSBracketAccess
22522253
def update(index: js.Number, v: js.String): Unit = ???
22532254
}
22542255

0 commit comments

Comments
 (0)