diff --git a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala index 374ac8a..177a793 100644 --- a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala +++ b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala @@ -109,10 +109,6 @@ */ def apply(): PluginRegistry = instance - def isRenderable(fileName: String): Boolean = { - instance.renderableExtensions.exists(extension => fileName.toLowerCase.endsWith("." + extension)) - } - /** * Initializes all installed plugins. */ diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala index 1642353..615775e 100644 --- a/src/main/scala/gitbucket/core/view/helpers.scala +++ b/src/main/scala/gitbucket/core/view/helpers.scala @@ -106,6 +106,10 @@ 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. diff --git a/src/main/twirl/gitbucket/core/repo/blob.scala.html b/src/main/twirl/gitbucket/core/repo/blob.scala.html index 026e97c..8ed980e 100644 --- a/src/main/twirl/gitbucket/core/repo/blob.scala.html +++ b/src/main/twirl/gitbucket/core/repo/blob.scala.html @@ -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){
@@ -76,7 +75,7 @@ @if(content.viewType == "text"){ - @defining(PluginRegistry.isRenderable(pathList.reverse.head)){ isRrenderable => + @defining(isRenderable(pathList.reverse.head)){ isRrenderable => @if(!isBlame && isRrenderable) {
@renderMarkup(pathList, content.content.get, branch, repository, false, false) diff --git a/src/main/twirl/gitbucket/core/repo/editor.scala.html b/src/main/twirl/gitbucket/core/repo/editor.scala.html index 4466e3b..fc5b7c6 100644 --- a/src/main/twirl/gitbucket/core/repo/editor.scala.html +++ b/src/main/twirl/gitbucket/core/repo/editor.scala.html @@ -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){
@@ -121,7 +120,7 @@ $('#editor').hide(); $('#preview').show() - @if(fileName.map(PluginRegistry.isRenderable _).getOrElse(false)) { + @if(fileName.map(isRenderable _).getOrElse(false)) { // update preview $('#preview').html(' Previewing...'); $.post('@url(repository)/_preview', {