(refs #775)Move isRenderable() to helpers from PluginRepository

This commit is contained in:
Naoki Takezoe
2015-06-05 01:34:23 +09:00
parent aa5a07b98e
commit 957dfeed6d
4 changed files with 6 additions and 8 deletions

View File

@@ -109,10 +109,6 @@ object PluginRegistry {
*/
def apply(): PluginRegistry = instance
def isRenderable(fileName: String): Boolean = {
instance.renderableExtensions.exists(extension => fileName.toLowerCase.endsWith("." + extension))
}
/**
* Initializes all installed plugins.
*/

View File

@@ -106,6 +106,10 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
renderer.render(RenderRequest(filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, context))
}
def isRenderable(fileName: String): Boolean = {
PluginRegistry().renderableExtensions.exists(extension => fileName.toLowerCase.endsWith("." + extension))
}
/**
* Returns <img> which displays the avatar icon for the given user name.
* This method looks up Gravatar if avatar icon has not been configured in user settings.

View File

@@ -7,7 +7,6 @@
isBlame: Boolean)(implicit context: gitbucket.core.controller.Context)
@import context._
@import gitbucket.core.view.helpers._
@import gitbucket.core.plugin.PluginRegistry
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
@html.menu("code", repository){
<div class="head">
@@ -76,7 +75,7 @@
<tr>
<td>
@if(content.viewType == "text"){
@defining(PluginRegistry.isRenderable(pathList.reverse.head)){ isRrenderable =>
@defining(isRenderable(pathList.reverse.head)){ isRrenderable =>
@if(!isBlame && isRrenderable) {
<div class="box-content markdown-body" style="border: none; padding-left: 16px; padding-right: 16px;">
@renderMarkup(pathList, content.content.get, branch, repository, false, false)

View File

@@ -5,7 +5,6 @@
content: gitbucket.core.util.JGitUtil.ContentInfo)(implicit context: gitbucket.core.controller.Context)
@import context._
@import gitbucket.core.view.helpers._
@import gitbucket.core.plugin.PluginRegistry
@html.main(if(fileName.isEmpty) "New File" else s"Editing ${fileName.get} at ${branch} - ${repository.owner}/${repository.name}", Some(repository)) {
@html.menu("code", repository){
<form method="POST" action="@url(repository)/@if(fileName.isEmpty){create}else{update}" validate="true">
@@ -121,7 +120,7 @@ $(function(){
$('#editor').hide();
$('#preview').show()
@if(fileName.map(PluginRegistry.isRenderable _).getOrElse(false)) {
@if(fileName.map(isRenderable _).getOrElse(false)) {
// update preview
$('#preview').html('<img src="@assets/common/images/indicator.gif"> Previewing...');
$.post('@url(repository)/_preview', {