mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-11-26 19:56:11 +01:00
b272224918
Backport #28935 by @silverwind
The `ToUTF8*` functions were stripping BOM, while BOM is actually valid
in UTF8, so the stripping must be optional depending on use case. This
does:
- Add a options struct to all `ToUTF8*` functions, that by default will
strip BOM to preserve existing behaviour
- Remove `ToUTF8` function, it was dead code
- Rename `ToUTF8WithErr` to `ToUTF8`
- Preserve BOM in Monaco Editor
- Remove a unnecessary newline in the textarea value. Browsers did
ignore it, it seems but it's better not to rely on this behaviour.
Fixes: https://github.com/go-gitea/gitea/issues/28743
Related: https://github.com/go-gitea/gitea/issues/6716 which seems to
have once introduced a mechanism that strips and re-adds the BOM, but
from what I can tell, this mechanism was removed at some point after
that PR.
Co-authored-by: silverwind <me@silverwind.io>
(cherry picked from commit b8e6cffd31)
75 lines
3.7 KiB
Go HTML Template
75 lines
3.7 KiB
Go HTML Template
{{template "base/head" .}}
|
|
<div role="main" aria-label="{{.Title}}" class="page-content repository file editor edit">
|
|
{{template "repo/header" .}}
|
|
<div class="ui container">
|
|
{{template "base/alert" .}}
|
|
<form class="ui edit form" method="post">
|
|
{{.CsrfTokenHtml}}
|
|
<input type="hidden" name="last_commit" value="{{.last_commit}}">
|
|
<input type="hidden" name="page_has_posted" value="{{.PageHasPosted}}">
|
|
<div class="repo-editor-header">
|
|
<div class="ui breadcrumb field{{if .Err_TreePath}} error{{end}}">
|
|
<a class="section" href="{{$.BranchLink}}">{{.Repository.Name}}</a>
|
|
{{$n := len .TreeNames}}
|
|
{{$l := Eval $n "-" 1}}
|
|
{{range $i, $v := .TreeNames}}
|
|
<div class="breadcrumb-divider">/</div>
|
|
{{if eq $i $l}}
|
|
<input id="file-name" value="{{$v}}" placeholder="{{ctx.Locale.Tr "repo.editor.name_your_file"}}" data-editorconfig="{{$.EditorconfigJson}}" required autofocus>
|
|
<span data-tooltip-content="{{ctx.Locale.Tr "repo.editor.filename_help"}}">{{svg "octicon-info"}}</span>
|
|
{{else}}
|
|
<span class="section"><a href="{{$.BranchLink}}/{{index $.TreePaths $i | PathEscapeSegments}}">{{$v}}</a></span>
|
|
{{end}}
|
|
{{end}}
|
|
<span>{{ctx.Locale.Tr "repo.editor.or"}} <a href="{{$.BranchLink}}{{if not .IsNewFile}}/{{PathEscapeSegments .TreePath}}{{end}}">{{ctx.Locale.Tr "repo.editor.cancel_lower"}}</a></span>
|
|
<input type="hidden" id="tree_path" name="tree_path" value="{{.TreePath}}" required>
|
|
</div>
|
|
</div>
|
|
<div class="field">
|
|
<div class="ui top attached tabular menu" data-write="write" data-preview="preview" data-diff="diff">
|
|
<a class="active item" data-tab="write">{{svg "octicon-code"}} {{if .IsNewFile}}{{ctx.Locale.Tr "repo.editor.new_file"}}{{else}}{{ctx.Locale.Tr "repo.editor.edit_file"}}{{end}}</a>
|
|
<a class="item" data-tab="preview" data-url="{{.Repository.Link}}/markup" data-context="{{.RepoLink}}/src/{{.BranchNameSubURL}}" data-markup-mode="file">{{svg "octicon-eye"}} {{ctx.Locale.Tr "preview"}}</a>
|
|
{{if not .IsNewFile}}
|
|
<a class="item" data-tab="diff" data-url="{{.RepoLink}}/_preview/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}" data-context="{{.BranchLink}}">{{svg "octicon-diff"}} {{ctx.Locale.Tr "repo.editor.preview_changes"}}</a>
|
|
{{end}}
|
|
</div>
|
|
<div class="ui bottom attached active tab segment" data-tab="write">
|
|
<textarea id="edit_area" name="content" class="gt-hidden" data-id="repo-{{.Repository.Name}}-{{.TreePath}}"
|
|
data-url="{{.Repository.Link}}/markup"
|
|
data-context="{{.RepoLink}}"
|
|
data-previewable-extensions="{{.PreviewableExtensions}}"
|
|
data-line-wrap-extensions="{{.LineWrapExtensions}}">{{.FileContent}}</textarea>
|
|
<div class="editor-loading is-loading"></div>
|
|
</div>
|
|
<div class="ui bottom attached tab segment markup" data-tab="preview">
|
|
{{ctx.Locale.Tr "loading"}}
|
|
</div>
|
|
<div class="ui bottom attached tab segment diff edit-diff" data-tab="diff">
|
|
{{ctx.Locale.Tr "loading"}}
|
|
</div>
|
|
</div>
|
|
{{template "repo/editor/commit_form" .}}
|
|
</form>
|
|
</div>
|
|
<div class="ui g-modal-confirm modal" id="edit-empty-content-modal">
|
|
<div class="header">
|
|
{{svg "octicon-file"}}
|
|
{{ctx.Locale.Tr "repo.editor.commit_empty_file_header"}}
|
|
</div>
|
|
<div class="center content">
|
|
<p>{{ctx.Locale.Tr "repo.editor.commit_empty_file_text"}}</p>
|
|
</div>
|
|
<div class="actions">
|
|
<button class="ui cancel button">
|
|
{{svg "octicon-x"}}
|
|
{{ctx.Locale.Tr "repo.editor.cancel"}}
|
|
</button>
|
|
<button class="ui primary ok button">
|
|
{{svg "fontawesome-save"}}
|
|
{{ctx.Locale.Tr "repo.editor.commit_changes"}}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{template "base/footer" .}}
|