Skip to content
This repository has been archived by the owner on Aug 10, 2024. It is now read-only.

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
sanity committed Mar 29, 2017
2 parents 51ddf4b + e6c0d62 commit cd524c8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/).
For more information please visit our main website at [kweb.io](http://kweb.io/).
2 changes: 1 addition & 1 deletion docs/_posts/2017-03-03-getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ For [Maven](https://maven.apache.org/) users, add this to the repositories secti
<repository><snapshots><enabled>false</enabled></snapshots>
<id>dl</id><name>bintray</name><url>http://dl.bintray.com/kotlin/kotlin-eap-1.1</url>
</repository>
<repository><id>ktor</id><url>"http://dl.bintray.com/kotlin/ktor"</url></repository>
<repository><id>ktor</id><url>http://dl.bintray.com/kotlin/ktor</url></repository>
</repositories>
```

Expand Down
8 changes: 4 additions & 4 deletions src/main/kotlin/com/github/sanity/kweb/Kweb.kt
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,6 @@ class Kweb(val port: Int,
KwebHotswapPlugin.addHotswapReloadListener({refreshAllPages()})
}

val bootstrapHtmlTemplate = IOUtils.toString(javaClass.getResourceAsStream("kweb_bootstrap.html"), Charsets.UTF_8)
.replace("<!-- START HEADER PLACEHOLDER -->", startHeadBuilder.toString())
.replace("<!-- END HEADER PLACEHOLDER -->", endHeadBuilder.toString())

server= embeddedNettyServer(port) {
install(DefaultHeaders)
install(Routing) {
Expand All @@ -93,6 +89,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("<!-- START HEADER PLACEHOLDER -->", startHeadBuilder.toString())
.replace("<!-- END HEADER PLACEHOLDER -->", endHeadBuilder.toString())

// Setup default KWeb routing.
get("/") {
Expand Down

0 comments on commit cd524c8

Please sign in to comment.