Skip to content

Commit ceced2b

Browse files
committed
Update doc and reformat a little after Scala.JS upgrade
1 parent cfb58b1 commit ceced2b

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ Includes a router, testing utils, performance utils, more.
4343
##### Requirements:
4444
* React 0.14
4545
* Scala 2.11
46-
* Scala.JS 0.6.4+
46+
* Scala.JS 0.6.5+

core/src/main/scala/japgolly/scalajs/react/types.scala

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,10 @@ object CompScope {
6464
@JSName("forceUpdate") private[react] def _forceUpdate(): Unit = js.native
6565
}
6666

67-
@js.native
68-
trait ReadDirect extends Object
69-
@js.native
70-
trait ReadCallback extends Object
71-
@js.native
72-
trait WriteDirect extends Object
73-
@js.native
74-
trait WriteCallback extends Object
67+
@js.native trait ReadDirect extends Object
68+
@js.native trait ReadCallback extends Object
69+
@js.native trait WriteDirect extends Object
70+
@js.native trait WriteCallback extends Object
7571

7672
@js.native
7773
trait AnyUnmounted[Props, State, +Backend]

doc/CHANGELOG-0.10.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# 0.10.1 (unreleased)
22

3+
* Upgrade Scala.JS to 0.6.5.
34
* Add `React.Children.toArray`.
45

56
---

test/src/main/scala/japgolly/scalajs/react/test/package.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ package object test {
88

99
@js.native
1010
sealed trait ComponentClass extends Object
11+
1112
@inline final implicit def autoComponentClassFromScalaComponent(c: ReactComponentC[_, _, _, _]): ComponentClass =
1213
c.reactClass.asInstanceOf[ComponentClass]
1314

1415
final type ComponentM = ReactComponentM_[TopNode]
1516

1617
@js.native
1718
sealed trait ReactOrDomNode extends Object
19+
1820
@inline final implicit def autoReactOrDomNodeN(n: TopNode): ReactOrDomNode =
1921
n.asInstanceOf[ReactOrDomNode]
2022
@inline final implicit def autoReactOrDomNodeU(c: ReactElement): ReactOrDomNode =

0 commit comments

Comments
 (0)