Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 22:15:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move implicit conversion for mkHtml to util.Implicits.

Browse Source
This commit is contained in:
takezoe
2013-06-23 22:26:38 +09:00
parent 4326f34ef5
commit 27977d3263
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/util/Implicits.scala
View File

@@ -1,5 +1,7 @@
package util package util
import twirl.api.Html
/** /**
* Provides some usable implicit conversions. * Provides some usable implicit conversions.
*/ */
@@ -20,7 +22,11 @@ object Implicits {
case Nil => result case Nil => result
} }
} }
}
implicit def extendsHtmlSeq(seq: Seq[Html]) = new {
def mkHtml(separator: String) = Html(seq.mkString(separator))
def mkHtml(separator: scala.xml.Elem) = Html(seq.mkString(separator.toString))
} }
} }

22
src/main/scala/view/helpers.scala
View File

@@ -40,14 +40,14 @@ object helpers {
} }
/** ///**
* Provides implicit conversions for Twirl templates. // * Provides implicit conversions for Twirl templates.
*/ // */
object implicits { //object implicits {
//
implicit def extendsHtmlSeq(seq: Seq[Html]) = new { // implicit def extendsHtmlSeq(seq: Seq[Html]) = new {
def mkHtml(separator: String) = Html(seq.mkString(separator)) // def mkHtml(separator: String) = Html(seq.mkString(separator))
def mkHtml(separator: scala.xml.Elem) = Html(seq.mkString(separator.toString)) // def mkHtml(separator: scala.xml.Elem) = Html(seq.mkString(separator.toString))
} // }
//
} //}

2
src/main/twirl/repo/commit.scala.html
View File

@@ -1,7 +1,7 @@
@(commitId: String, commit: util.JGitUtil.CommitInfo, branches: List[String], tags: List[String], repository: service.RepositoryService.RepositoryInfo, diffs: Seq[util.JGitUtil.DiffInfo])(implicit context: app.Context) @(commitId: String, commit: util.JGitUtil.CommitInfo, branches: List[String], tags: List[String], repository: service.RepositoryService.RepositoryInfo, diffs: Seq[util.JGitUtil.DiffInfo])(implicit context: app.Context)
@import context._ @import context._
@import view.helpers @import view.helpers
@import view.implicits._ @import util.Implicits._
@import org.eclipse.jgit.diff.DiffEntry.ChangeType @import org.eclipse.jgit.diff.DiffEntry.ChangeType
@html.main(commit.shortMessage){ @html.main(commit.shortMessage){
@html.header("code", repository) @html.header("code", repository)