mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-27 02:10:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

#2458 fix emoji been rendered inside raw content area

Browse source
This commit is contained in:
Unknwon 2016-07-11 05:28:56 +08:00
parent a1f717f65a
commit fdcca9292e
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
##### Current tip version: 0.9.40 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions) ##### Current tip version: 0.9.41 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
| Web | UI | Preview | | Web | UI | Preview |
|:-------------:|:-------:|:-------:| |:-------------:|:-------:|:-------:|

2
gogs.go
View file

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.9.40.0709" const APP_VER = "0.9.41.0711"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

2
public/config.codekit
View file

@ -1,6 +1,6 @@
{ {
"CodeKitInfo": "This is a CodeKit 2.x project configuration file. It is designed to sync project settings across multiple machines. MODIFYING THE CONTENTS OF THIS FILE IS A POOR LIFE DECISION. If you do so, you will likely cause CodeKit to crash. This file is not useful unless accompanied by the project that created it in CodeKit 2. This file is not backwards-compatible with CodeKit 1.x. For more information, see: http:\/\/incident57.com\/codekit", "CodeKitInfo": "This is a CodeKit 2.x project configuration file. It is designed to sync project settings across multiple machines. MODIFYING THE CONTENTS OF THIS FILE IS A POOR LIFE DECISION. If you do so, you will likely cause CodeKit to crash. This file is not useful unless accompanied by the project that created it in CodeKit 2. This file is not backwards-compatible with CodeKit 1.x. For more information, see: http:\/\/incident57.com\/codekit",
"creatorBuild": "19102", "creatorBuild": "19115",
"files": { "files": {
"\/css\/github.min.css": { "\/css\/github.min.css": {
"fileType": 16, "fileType": 16,

2
templates/.VERSION
View file

@ -1 +1 @@
0.9.40.0709 0.9.41.0711

4
templates/repo/issue/view.tmpl
View file

@ -16,11 +16,11 @@
{{if .Issue.IsPull}} {{if .Issue.IsPull}}
{{template "repo/issue/view_title" .}} {{template "repo/issue/view_title" .}}
{{template "repo/pulls/tab_menu" .}} {{template "repo/pulls/tab_menu" .}}
<div class="ui bottom attached tab pull segment active has-emoji" data-tab="request-{{.ID}}"> <div class="ui bottom attached tab pull segment active" data-tab="request-{{.ID}}">
{{template "repo/issue/view_content" .}} {{template "repo/issue/view_content" .}}
</div> </div>
{{else}} {{else}}
<div class="has-emoji"> <div>
{{template "repo/issue/view_content" .}} {{template "repo/issue/view_content" .}}
</div> </div>
{{end}} {{end}}

6
templates/repo/issue/view_content.tmpl
View file

@ -25,7 +25,7 @@
</div> </div>
</div> </div>
<div class="ui attached segment"> <div class="ui attached segment">
<div class="render-content markdown emojify"> <div class="render-content markdown has-emoji">
{{if .Issue.RenderedContent}} {{if .Issue.RenderedContent}}
{{.Issue.RenderedContent|Str2html}} {{.Issue.RenderedContent|Str2html}}
{{else}} {{else}}
@ -77,7 +77,7 @@
</div> </div>
</div> </div>
<div class="ui attached segment"> <div class="ui attached segment">
<div class="render-content markdown emojify"> <div class="render-content markdown has-emoji">
{{if .RenderedContent}} {{if .RenderedContent}}
{{.RenderedContent|Str2html}} {{.RenderedContent|Str2html}}
{{else}} {{else}}
@ -342,7 +342,7 @@
<div class="ui bottom attached active write tab segment"> <div class="ui bottom attached active write tab segment">
<textarea tabindex="1" id="content" name="content"></textarea> <textarea tabindex="1" id="content" name="content"></textarea>
</div> </div>
<div class="ui bottom attached tab preview segment markdown emojify"> <div class="ui bottom attached tab preview segment markdown">
{{$.i18n.Tr "repo.release.loading"}} {{$.i18n.Tr "repo.release.loading"}}
</div> </div>
<div class="text right edit buttons"> <div class="text right edit buttons">