From 85ac237bdb30e3dc68565149643850e6e430de04 Mon Sep 17 00:00:00 2001 From: Andy Bao Date: Sat, 18 Mar 2017 13:12:17 -0400 Subject: [PATCH 1/4] Fix changes to the bootstrap template not being applied --- src/main/kotlin/com/github/sanity/kweb/Kweb.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/com/github/sanity/kweb/Kweb.kt b/src/main/kotlin/com/github/sanity/kweb/Kweb.kt index 83070b9ef3..5eabe8f43c 100644 --- a/src/main/kotlin/com/github/sanity/kweb/Kweb.kt +++ b/src/main/kotlin/com/github/sanity/kweb/Kweb.kt @@ -78,10 +78,6 @@ class Kweb(val port: Int, KwebHotswapPlugin.addHotswapReloadListener({refreshAllPages()}) } - val bootstrapHtmlTemplate = IOUtils.toString(javaClass.getResourceAsStream("kweb_bootstrap.html"), Charsets.UTF_8) - .replace("", startHeadBuilder.toString()) - .replace("", endHeadBuilder.toString()) - server= embeddedNettyServer(port) { install(DefaultHeaders) install(Routing) { @@ -94,6 +90,10 @@ class Kweb(val port: Int, for (plugin in plugins) { applyPlugin(plugin = plugin, appliedPlugins = mutableAppliedPlugins, endHeadBuilder = endHeadBuilder, startHeadBuilder = startHeadBuilder, routeHandler = this) } + + val bootstrapHtmlTemplate = IOUtils.toString(javaClass.getResourceAsStream("kweb_bootstrap.html"), Charsets.UTF_8) + .replace("", startHeadBuilder.toString()) + .replace("", endHeadBuilder.toString()) // Setup default KWeb routing. get("/") { From 1d25c456febac68bfa5334dca23ddfcaf2d0e103 Mon Sep 17 00:00:00 2001 From: Ian Clarke Date: Sat, 18 Mar 2017 21:35:35 -0500 Subject: [PATCH 2/4] Fixes #18 --- docs/_posts/2017-03-03-getting-started.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_posts/2017-03-03-getting-started.md b/docs/_posts/2017-03-03-getting-started.md index 2662052ac8..a70dd79ff8 100644 --- a/docs/_posts/2017-03-03-getting-started.md +++ b/docs/_posts/2017-03-03-getting-started.md @@ -74,7 +74,7 @@ For [Maven](https://maven.apache.org/) users, add this to the repositories secti false dlbintrayhttp://dl.bintray.com/kotlin/kotlin-eap-1.1 -ktor"http://dl.bintray.com/kotlin/ktor" +ktorhttp://dl.bintray.com/kotlin/ktor ``` From 50c6d53e8c2a0b50ac25e6eb26c0c58233aff825 Mon Sep 17 00:00:00 2001 From: Ian Clarke Date: Sat, 18 Mar 2017 21:55:29 -0500 Subject: [PATCH 3/4] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f2e9608c77..1adc0c464c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'com.github.sanity' -version '0.0.38' +version '0.0.39' buildscript { ext.kotlin_version = '1.1.1' From e6c0d6270e64d5c5bb57ff13506a3992d5d1db18 Mon Sep 17 00:00:00 2001 From: Ian Clarke Date: Sun, 19 Mar 2017 16:44:51 -0500 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b2381b17b1..94de66196e 100644 --- a/README.md +++ b/README.md @@ -5,4 +5,4 @@ Kweb is a library for building rich web applications in the Kotlin programming language. You can think of it as a powerful Kotlin DSL that allows you to remote-control web browsers from a web server. -For more information please visit our main website at [kweb.io](https://kweb.io/). \ No newline at end of file +For more information please visit our main website at [kweb.io](http://kweb.io/).