Skip to content

Commit 298ddbc

Browse files
committed
Merge remote-tracking branch 'origin/base-versions-update'
2 parents a2f6aa7 + 7d17f43 commit 298ddbc

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

client/src/main/scala/example/ScalaJSExample.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package example
22

33
import com.thoughtworks.binding.Binding.Var
4-
import com.thoughtworks.binding.dom
4+
import com.thoughtworks.binding.{Binding, dom}
55
import org.scalajs.dom.document
66
import org.scalajs.dom.ext.Ajax
7-
import org.scalajs.dom.raw.Event
7+
import org.scalajs.dom.raw.{Event, HTMLElement}
88

99
import scala.scalajs.concurrent.JSExecutionContext.Implicits.queue
1010
import scala.scalajs.js
@@ -14,6 +14,7 @@ import scala.scalajs.js.JSON
1414

1515
object ScalaJSExample extends js.JSApp {
1616

17+
implicit def makeIntellijHappy(x: scala.xml.Elem): Binding[HTMLElement] = ???
1718

1819
/**
1920
* Ajax Request to server, updates data state with number
@@ -22,8 +23,8 @@ object ScalaJSExample extends js.JSApp {
2223
*/
2324
def countRequest(data: Var[String]) = {
2425
val url = "http://localhost:9000/count"
25-
Ajax.get(url).onSuccess { case xhr =>
26-
data := JSON.parse(xhr.responseText).count.toString
26+
Ajax.get(url).foreach { case xhr =>
27+
data.value = JSON.parse(xhr.responseText).count.toString
2728
}
2829
}
2930

server/conf/application.conf

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ akka {
4040
# ~~~~~
4141
# The secret key is used to sign Play's session cookie.
4242
# This must be changed for production, but we don't recommend you change it in this file.
43-
play.crypto.secret = "changeme"
43+
play.http.crypto.secret = "changeme"
4444

4545
## Modules
4646
# https://www.playframework.com/documentation/latest/Modules
@@ -345,7 +345,3 @@ db {
345345
# https://www.playframework.com/documentation/latest/Highlights25#Logging-SQL-statements
346346
#default.logSql=true
347347
}
348-
349-
slick.dbs.default.driver="slick.driver.H2Driver$"
350-
slick.dbs.default.db.driver="org.h2.Driver"
351-
slick.dbs.default.db.url="jdbc:h2:mem:test"

0 commit comments

Comments
 (0)