From b2c6a0e24a7f661b4af914a8640d4a9babd3e429 Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 2 May 2013 02:51:17 +0900 Subject: [PATCH] Convert Markdown to HTML in the view by view.helpers.markdown(). --- src/main/scala/app/RepositoryViewerController.scala | 4 +--- src/main/twirl/files.scala.html | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala index 23ead733a..f6b45f03a 100644 --- a/src/main/scala/app/RepositoryViewerController.scala +++ b/src/main/scala/app/RepositoryViewerController.scala @@ -213,9 +213,7 @@ class RepositoryViewerController extends ControllerBase { // process README.md val readme = files.find(_.name == "README.md").map { file => - import org.pegdown._ - val git = Git.open(getRepositoryDir(owner, repository)) - new PegDownProcessor().markdownToHtml(new String(git.getRepository.open(file.id).getBytes, "UTF-8")) + new String(JGitUtil.getContent(Git.open(getRepositoryDir(owner, repository)), file.id, true).get, "UTF-8") } html.files( diff --git a/src/main/twirl/files.scala.html b/src/main/twirl/files.scala.html index 786d1d98a..d75d0245c 100644 --- a/src/main/twirl/files.scala.html +++ b/src/main/twirl/files.scala.html @@ -52,10 +52,10 @@ } - @readme.map { html => + @readme.map { content => - +
@Html(html)@helpers.markdown(content)
}