mirror of
https://github.com/go-gitea/gitea
synced 2024-09-12 12:19:38 +02:00
Revert "Fix EOL handling in web editor" (#28101)
Reverts go-gitea/gitea#27141 close #28097
This commit is contained in:
parent
4d0eba8e0a
commit
37ed92d6fd
3 changed files with 6 additions and 22 deletions
|
@ -287,7 +287,7 @@ func editFilePost(ctx *context.Context, form forms.EditRepoFileForm, isNewFile b
|
||||||
Operation: operation,
|
Operation: operation,
|
||||||
FromTreePath: ctx.Repo.TreePath,
|
FromTreePath: ctx.Repo.TreePath,
|
||||||
TreePath: form.TreePath,
|
TreePath: form.TreePath,
|
||||||
ContentReader: strings.NewReader(form.Content),
|
ContentReader: strings.NewReader(strings.ReplaceAll(form.Content, "\r", "")),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
Signoff: form.Signoff,
|
Signoff: form.Signoff,
|
||||||
|
|
|
@ -34,13 +34,12 @@
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
<div class="ui bottom attached active tab segment" data-tab="write">
|
<div class="ui bottom attached active tab segment" data-tab="write">
|
||||||
<textarea id="edit_area" name="content" class="gt-hidden"
|
<textarea id="edit_area" name="content" class="gt-hidden" data-id="repo-{{.Repository.Name}}-{{.TreePath}}"
|
||||||
data-id="repo-{{.Repository.Name}}-{{.TreePath}}"
|
|
||||||
data-url="{{.Repository.Link}}/markup"
|
data-url="{{.Repository.Link}}/markup"
|
||||||
data-context="{{.RepoLink}}"
|
data-context="{{.RepoLink}}"
|
||||||
data-previewable-extensions="{{.PreviewableExtensions}}"
|
data-previewable-extensions="{{.PreviewableExtensions}}"
|
||||||
data-line-wrap-extensions="{{.LineWrapExtensions}}"
|
data-line-wrap-extensions="{{.LineWrapExtensions}}">
|
||||||
data-initial-value="{{JsonUtils.EncodeToString .FileContent}}"></textarea>
|
{{.FileContent}}</textarea>
|
||||||
<div class="editor-loading is-loading"></div>
|
<div class="editor-loading is-loading"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="ui bottom attached tab segment markup" data-tab="preview">
|
<div class="ui bottom attached tab segment markup" data-tab="preview">
|
||||||
|
|
|
@ -62,7 +62,7 @@ export async function createMonaco(textarea, filename, editorOpts) {
|
||||||
const monaco = await import(/* webpackChunkName: "monaco" */'monaco-editor');
|
const monaco = await import(/* webpackChunkName: "monaco" */'monaco-editor');
|
||||||
|
|
||||||
initLanguages(monaco);
|
initLanguages(monaco);
|
||||||
let {language, eol, ...other} = editorOpts;
|
let {language, ...other} = editorOpts;
|
||||||
if (!language) language = getLanguage(filename);
|
if (!language) language = getLanguage(filename);
|
||||||
|
|
||||||
const container = document.createElement('div');
|
const container = document.createElement('div');
|
||||||
|
@ -105,28 +105,14 @@ export async function createMonaco(textarea, filename, editorOpts) {
|
||||||
monaco.languages.register({id: 'vs.editor.nullLanguage'});
|
monaco.languages.register({id: 'vs.editor.nullLanguage'});
|
||||||
monaco.languages.setLanguageConfiguration('vs.editor.nullLanguage', {});
|
monaco.languages.setLanguageConfiguration('vs.editor.nullLanguage', {});
|
||||||
|
|
||||||
// We encode the initial value in JSON on the backend to prevent browsers from
|
|
||||||
// discarding the \r during HTML parsing:
|
|
||||||
// https://html.spec.whatwg.org/multipage/parsing.html#preprocessing-the-input-stream
|
|
||||||
const value = JSON.parse(textarea.getAttribute('data-initial-value') || '""');
|
|
||||||
textarea.value = value;
|
|
||||||
textarea.removeAttribute('data-initial-value');
|
|
||||||
|
|
||||||
const editor = monaco.editor.create(container, {
|
const editor = monaco.editor.create(container, {
|
||||||
value,
|
value: textarea.value,
|
||||||
theme: 'gitea',
|
theme: 'gitea',
|
||||||
language,
|
language,
|
||||||
...other,
|
...other,
|
||||||
});
|
});
|
||||||
|
|
||||||
const model = editor.getModel();
|
const model = editor.getModel();
|
||||||
|
|
||||||
// Monaco performs auto-detection of dominant EOL in the file, biased towards LF for
|
|
||||||
// empty files. If there is an editorconfig value, override this detected value.
|
|
||||||
if (eol in monaco.editor.EndOfLineSequence) {
|
|
||||||
model.setEOL(monaco.editor.EndOfLineSequence[eol]);
|
|
||||||
}
|
|
||||||
|
|
||||||
model.onDidChangeContent(() => {
|
model.onDidChangeContent(() => {
|
||||||
textarea.value = editor.getValue();
|
textarea.value = editor.getValue();
|
||||||
textarea.dispatchEvent(new Event('change')); // seems to be needed for jquery-are-you-sure
|
textarea.dispatchEvent(new Event('change')); // seems to be needed for jquery-are-you-sure
|
||||||
|
@ -201,6 +187,5 @@ function getEditorConfigOptions(ec) {
|
||||||
opts.trimAutoWhitespace = ec.trim_trailing_whitespace === true;
|
opts.trimAutoWhitespace = ec.trim_trailing_whitespace === true;
|
||||||
opts.insertSpaces = ec.indent_style === 'space';
|
opts.insertSpaces = ec.indent_style === 'space';
|
||||||
opts.useTabStops = ec.indent_style === 'tab';
|
opts.useTabStops = ec.indent_style === 'tab';
|
||||||
opts.eol = ec.end_of_line?.toUpperCase();
|
|
||||||
return opts;
|
return opts;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue