From b6026ba50f7d0490483466a6557c778cf7cd58df Mon Sep 17 00:00:00 2001 From: Starzu Date: Mon, 11 Jul 2016 16:05:19 +0200 Subject: [PATCH] Upgrade demos to 0.3.0 --- rest-spray-io/project/Dependencies.scala | 2 +- test.sh | 1 + .../scala/io/udash/todo/views/todo/HeaderComponent.scala | 2 +- .../io/udash/todo/views/todo/TodoElementComponent.scala | 2 +- .../src/main/scala/io/udash/todo/views/todo/TodoView.scala | 6 +++--- todo-rpc/project/Dependencies.scala | 2 +- todo/project/Dependencies.scala | 2 +- .../scala/io/udash/todo/views/todo/HeaderComponent.scala | 2 +- .../io/udash/todo/views/todo/TodoElementComponent.scala | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-) diff --git a/rest-spray-io/project/Dependencies.scala b/rest-spray-io/project/Dependencies.scala index 561b7ac..611be4a 100644 --- a/rest-spray-io/project/Dependencies.scala +++ b/rest-spray-io/project/Dependencies.scala @@ -2,7 +2,7 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ import sbt._ object Dependencies extends Build { - val udashVersion = "0.3.0-SNAPSHOT" + val udashVersion = "0.3.0-rc.2" val udashJQueryVersion = "1.0.0" val logbackVersion = "1.1.3" diff --git a/test.sh b/test.sh index 63ff945..2fc2ba5 100755 --- a/test.sh +++ b/test.sh @@ -10,6 +10,7 @@ for subproject in `ls */build.sbt`; do echo -e "Test \e[32msucceed\e[39m!" else echo -e "Test \e[31mfailed\e[39m!" + cat compilation.log ((ERRORS++)) fi cd .. diff --git a/todo-rpc/frontend/src/main/scala/io/udash/todo/views/todo/HeaderComponent.scala b/todo-rpc/frontend/src/main/scala/io/udash/todo/views/todo/HeaderComponent.scala index 8d5f7ef..e9ac283 100644 --- a/todo-rpc/frontend/src/main/scala/io/udash/todo/views/todo/HeaderComponent.scala +++ b/todo-rpc/frontend/src/main/scala/io/udash/todo/views/todo/HeaderComponent.scala @@ -10,7 +10,7 @@ import scalatags.JsDom.all._ object HeaderComponent { def apply(name: Property[String], addCallback: (Property[String]) => Any): JsDom.TypedTag[html.Element] = header(cls := "header")( - TextInput(name)( + TextInput.debounced(name)( cls := "new-todo", placeholder := "What needs to be done?", autofocus := true, diff --git a/todo-rpc/frontend/src/main/scala/io/udash/todo/views/todo/TodoElementComponent.scala b/todo-rpc/frontend/src/main/scala/io/udash/todo/views/todo/TodoElementComponent.scala index 8f87337..1d92fd0 100644 --- a/todo-rpc/frontend/src/main/scala/io/udash/todo/views/todo/TodoElementComponent.scala +++ b/todo-rpc/frontend/src/main/scala/io/udash/todo/views/todo/TodoElementComponent.scala @@ -40,7 +40,7 @@ object TodoElementComponent { onclick :+= ((ev: Event) => { deleteItem(); true }) ) ), - TextInput(item.subProp(_.editName))( + TextInput.debounced(item.subProp(_.editName))( cls := "edit", onkeydown :+= ((ev: KeyboardEvent) => { if (ev.keyCode == KeyCode.Enter) { diff --git a/todo-rpc/frontend/src/main/scala/io/udash/todo/views/todo/TodoView.scala b/todo-rpc/frontend/src/main/scala/io/udash/todo/views/todo/TodoView.scala index 41cf268..620a75b 100644 --- a/todo-rpc/frontend/src/main/scala/io/udash/todo/views/todo/TodoView.scala +++ b/todo-rpc/frontend/src/main/scala/io/udash/todo/views/todo/TodoView.scala @@ -3,7 +3,7 @@ package io.udash.todo.views.todo import io.udash._ import io.udash.todo._ import io.udash.todo.storage.RemoteTodoStorage -import io.udash.utils.Logger +import io.udash.utils.StrictLogging import io.udash.wrappers.jquery._ import org.scalajs.dom.Element @@ -19,7 +19,7 @@ object TodoViewPresenter extends ViewPresenter[TodoState] { } } -class TodoPresenter(model: ModelProperty[TodoViewModel]) extends Presenter[TodoState] { +class TodoPresenter(model: ModelProperty[TodoViewModel]) extends Presenter[TodoState] with StrictLogging { import Context._ import io.udash.todo.rpc.model.{Todo => STodo} @@ -44,7 +44,7 @@ class TodoPresenter(model: ModelProperty[TodoViewModel]) extends Presenter[TodoS RemoteTodoStorage.store(v.map(todo => STodo(todo.name, todo.completed))) ) case Failure(ex) => - Logger.error("Can not load todos from server!") + logger.error("Can not load todos from server!") } RemoteTodoStorage.listen((todos: Seq[STodo]) => { diff --git a/todo-rpc/project/Dependencies.scala b/todo-rpc/project/Dependencies.scala index f9c82fd..492b0b0 100644 --- a/todo-rpc/project/Dependencies.scala +++ b/todo-rpc/project/Dependencies.scala @@ -2,7 +2,7 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ import sbt._ object Dependencies extends Build { - val udashVersion = "0.2.0" + val udashVersion = "0.3.0-rc.2" val udashJQueryVersion = "1.0.0" val uPickleVersion = "0.4.0" diff --git a/todo/project/Dependencies.scala b/todo/project/Dependencies.scala index de83dc1..720c134 100644 --- a/todo/project/Dependencies.scala +++ b/todo/project/Dependencies.scala @@ -2,7 +2,7 @@ import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._ import sbt._ object Dependencies extends Build { - val udashCoreVersion = "0.2.0" + val udashCoreVersion = "0.3.0-rc.2" val udashJQueryVersion = "1.0.0" val uPickleVersion = "0.4.0" diff --git a/todo/src/main/scala/io/udash/todo/views/todo/HeaderComponent.scala b/todo/src/main/scala/io/udash/todo/views/todo/HeaderComponent.scala index 8d5f7ef..e9ac283 100644 --- a/todo/src/main/scala/io/udash/todo/views/todo/HeaderComponent.scala +++ b/todo/src/main/scala/io/udash/todo/views/todo/HeaderComponent.scala @@ -10,7 +10,7 @@ import scalatags.JsDom.all._ object HeaderComponent { def apply(name: Property[String], addCallback: (Property[String]) => Any): JsDom.TypedTag[html.Element] = header(cls := "header")( - TextInput(name)( + TextInput.debounced(name)( cls := "new-todo", placeholder := "What needs to be done?", autofocus := true, diff --git a/todo/src/main/scala/io/udash/todo/views/todo/TodoElementComponent.scala b/todo/src/main/scala/io/udash/todo/views/todo/TodoElementComponent.scala index 8f87337..1d92fd0 100644 --- a/todo/src/main/scala/io/udash/todo/views/todo/TodoElementComponent.scala +++ b/todo/src/main/scala/io/udash/todo/views/todo/TodoElementComponent.scala @@ -40,7 +40,7 @@ object TodoElementComponent { onclick :+= ((ev: Event) => { deleteItem(); true }) ) ), - TextInput(item.subProp(_.editName))( + TextInput.debounced(item.subProp(_.editName))( cls := "edit", onkeydown :+= ((ev: KeyboardEvent) => { if (ev.keyCode == KeyCode.Enter) {