Pārlūkot izejas kodu

Fix images in wiki edit preview (#11546) (#11602)

Make sure wiki editor sets wiki to true so gitea renders it as a wiki page.

Also change the context data attr for edit form. This looks wrong but everywhere else in our code assumes the urlPrefix to be just the repo url when rendering and manually adds /wiki to the rendered url regardless.

Fixes #11540
tags/v1.12.0-rc2
mrsdizzie pirms 4 gadiem
vecāks
revīzija
29368309ce
Revīzijas autora e-pasta adrese nav piesaistīta nevienam kontam
2 mainītis faili ar 3 papildinājumiem un 2 dzēšanām
  1. 1
    1
      templates/repo/wiki/new.tmpl
  2. 2
    1
      web_src/js/index.js

+ 1
- 1
templates/repo/wiki/new.tmpl Parādīt failu

@@ -21,7 +21,7 @@
<a class="item" data-tab="preview">{{.i18n.Tr "preview"}}</a>
</div>
<div class="field">
<textarea class="js-quick-submit" id="edit_area" name="content" data-id="wiki-{{.title}}" data-url="{{.Repository.APIURL}}/markdown" data-context="{{.RepoLink}}/wiki" required>{{if .PageIsWikiEdit}}{{.content}}{{else}}{{.i18n.Tr "repo.wiki.welcome"}}{{end}}</textarea>
<textarea class="js-quick-submit" id="edit_area" name="content" data-id="wiki-{{.title}}" data-url="{{.Repository.APIURL}}/markdown" data-context="{{.RepoLink}}" required>{{if .PageIsWikiEdit}}{{.content}}{{else}}{{.i18n.Tr "repo.wiki.welcome"}}{{end}}</textarea>
</div>
<div class="field">
<input name="message" placeholder="{{.i18n.Tr "repo.wiki.default_commit_message"}}">

+ 2
- 1
web_src/js/index.js Parādīt failu

@@ -1325,7 +1325,8 @@ function initWikiForm() {
_csrf: csrf,
mode: 'gfm',
context: $editArea.data('context'),
text: plainText
text: plainText,
wiki: true
}, (data) => {
preview.innerHTML = `<div class="markdown ui segment">${data}</div>`;
$(preview).find('pre code').each((_, e) => {

Notiek ielāde…
Atcelt
Saglabāt