aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/reading/component/widget/Modal.scala
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/scala/reading/component/widget/Modal.scala')
-rw-r--r--src/main/scala/reading/component/widget/Modal.scala20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/main/scala/reading/component/widget/Modal.scala b/src/main/scala/reading/component/widget/Modal.scala
index 81d0c78..db1f7e6 100644
--- a/src/main/scala/reading/component/widget/Modal.scala
+++ b/src/main/scala/reading/component/widget/Modal.scala
@@ -3,29 +3,27 @@ package reading.component.widget
import scala.util.Random
import org.scalajs.dom.raw.HTMLElement
-import rx._
-import rx.Ctx.Owner.Unsafe._
import scalacss.Defaults._
import scalacss.ScalatagsCss._
import scalatags.JsDom.all._
import reading.component.widget.style.{ Modal => ModalStyle }
-import reading.utils.{ RxAttr }
object Modal {
- def apply(onClose: => Unit)(content: HtmlTag): HtmlTag = {
+ def apply(onClose: => Unit)(content: Frag): Frag = {
val modalId = s"modal${Random.nextInt}"
Animate(
id = modalId,
duration = 250,
transition = Transition.easeOut,
- animate = (progress, element) => {
- element.style.opacity = s"$progress"
- element.childNodes(2) match {
- case e: HTMLElement => e.style.transform = s"scale(${0.85 + 0.15 * progress})"
+ animate =
+ (progress, element) => {
+ element.style.opacity = s"$progress"
+ element.childNodes(2) match {
+ case e: HTMLElement => e.style.transform = s"scale(${0.85 + 0.15 * progress})"
+ }
}
- }
)
div(
@@ -35,7 +33,7 @@ object Modal {
div(
ModalStyle.curtain,
- RxAttr(onclick, Rx(() => close(modalId, onClose)))
+ onclick := (() => close(modalId, onClose))
),
div(
@@ -43,7 +41,7 @@ object Modal {
content,
button(
ModalStyle.close,
- RxAttr(onclick, Rx(() => close(modalId, onClose))),
+ onclick := (() => close(modalId, onClose)),
"Fermer"
)
)