Updated to latest version of Profig and fixed Template to properly ha…

…ndle config
outr · Dec 4, 2018 · dbed7e2 · dbed7e2
1 parent a172610
commit dbed7e2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/build.sbt b/build.sbt
@@ -26,7 +26,7 @@ developers in ThisBuild := List(
   Developer(id="darkfrog", name="Matt Hicks", email="matt@matthicks.com", url=url("http://matthicks.com"))
 )
 
-val profigVersion = "2.3.3"
+val profigVersion = "2.3.4"
 val scribeVersion = "2.7.0"
 val powerScalaVersion = "2.0.5"
 val reactifyVersion = "3.0.3"

diff --git a/config.json b/config.json
diff --git a/dom/src/main/scala/io/youi/Template.scala b/dom/src/main/scala/io/youi/Template.scala
@@ -22,7 +22,7 @@ object TemplateMacros {
                                                             appName: context.Expr[String])(implicit e: context.WeakTypeTag[E]): context.Expr[E] = {
     import context.universe._
 
-    Profig.loadDefaults()
+    Profig.loadDefaultsMacro()
 
     val pathValue = path match {
       case Expr(Literal(Constant(value: String))) => value
@@ -63,7 +63,7 @@ object TemplateMacros {
                                                                appName: context.Expr[String])(implicit e: context.WeakTypeTag[E]): context.Expr[List[E]] = {
     import context.universe._
 
-    Profig.loadDefaults()
+    Profig.loadDefaultsMacro()
 
     val pathValue = path match {
       case Expr(Literal(Constant(value: String))) => value

diff --git a/example/js/src/main/scala/io/youi/example/ui/BootstrapLoginExample.scala b/example/js/src/main/scala/io/youi/example/ui/BootstrapLoginExample.scala
@@ -13,7 +13,7 @@ class BootstrapLoginExample extends UIExampleScreen {
   override def title: String = "Bootstrap Login"
   override def path: Path = path"/examples/bootstrap/login.html"
 
-  private lazy val form: html.Form = Template.byId[html.Form]("../login-example.html", "login-form", "youi")
+  private lazy val form: html.Form = Template.byId[html.Form]("login-example.html", "login-form", "youi")
 
   override def createUI(): Future[Unit] = {
     Button.color := Color.White