Fix file attachement area in Wiki page editing form

This commit is contained in:
Naoki Takezoe
2016-07-05 17:48:53 +09:00
parent 44ec64fb4b
commit efbb404bd4
3 changed files with 4 additions and 7 deletions

View File

@@ -1,10 +1,11 @@
@(owner: String, repository: String)(textarea: Html)(implicit context: gitbucket.core.controller.Context)
@(owner: String, repository: String, generateScript: Boolean = true)(textarea: Html)(implicit context: gitbucket.core.controller.Context)
@import context._
@import gitbucket.core.util.FileUtil
<div class="muted attachable">
@textarea
<div class="clickable">Attach images or documents by dragging &amp; dropping, or selecting them.</div>
</div>
@if(generateScript){
@defining("(id=\")([\\w\\-]*)(\")".r.findFirstMatchIn(textarea.body).map(_.group(2))){ textareaId =>
<script>
$(function(){
@@ -30,3 +31,4 @@ $(function(){
});
</script>
}
}

View File

@@ -28,11 +28,7 @@
@if(style.nonEmpty){ style="@style"}
@if(styleClass.nonEmpty){ class="@styleClass" }>@content</textarea>
}
@if(enableWikiLink){
@textarea
} else {
@helper.html.attached(repository.owner, repository.name)(textarea)
}
@helper.html.attached(repository.owner, repository.name, enableWikiLink)(textarea)
</div>
<div class="tab-pane" id="tab@(uid+1)">
<div class="markdown-body" id="preview-area@uid">

View File

@@ -30,7 +30,6 @@
placeholder = "",
uid = 1
)
<div class="clickable">Attach images or documents by dragging &amp; dropping, or selecting them.</div>
</div>
<div class="form-group">
<label for="message">Edit Message</label>