diff options
| author | mrsdizzie <info@mrsdizzie.com> | 2020-05-24 06:41:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-24 11:41:33 +0100 |
| commit | ae55dc7a6ba9c08c4a8e0750acf89f9ad3fabffb (patch) | |
| tree | 05da207d167e29d796f440b5dd9fdda866dbc004 | |
| parent | 814ca9ffea229f55f1f69b34d9a7f84054115669 (diff) | |
| download | gitea-ae55dc7a6ba9c08c4a8e0750acf89f9ad3fabffb.tar.gz gitea-ae55dc7a6ba9c08c4a8e0750acf89f9ad3fabffb.zip | |
Fix images in wiki edit preview (#11546)
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
| -rw-r--r-- | templates/repo/wiki/new.tmpl | 2 | ||||
| -rw-r--r-- | web_src/js/index.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 276ea54f3a..002a36de96 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -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"}}"> diff --git a/web_src/js/index.js b/web_src/js/index.js index 46b0425014..553948bb36 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1323,7 +1323,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) => { |