From 5de76965a1f571444deee23410117b6d35996f1d Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Mon, 1 Mar 2021 00:48:29 +0800 Subject: [PATCH] add preview support for wiki editor when disable simpleMDE (#14757) Signed-off-by: a1012112796 <1012112796@qq.com> --- templates/repo/wiki/new.tmpl | 10 ++++++---- web_src/js/index.js | 24 ++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/templates/repo/wiki/new.tmpl b/templates/repo/wiki/new.tmpl index 06450a6ec4..6de6ef9a20 100644 --- a/templates/repo/wiki/new.tmpl +++ b/templates/repo/wiki/new.tmpl @@ -16,12 +16,14 @@
-
+
{{.i18n.Tr "write"}} - {{.i18n.Tr "preview"}} + {{$.i18n.Tr "preview"}}
-
- +
+
+ +
diff --git a/web_src/js/index.js b/web_src/js/index.js index 30af5dea15..7df170b930 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1414,6 +1414,7 @@ function initWikiForm() { const $editArea = $('.repository.wiki textarea#edit_area'); let sideBySideChanges = 0; let sideBySideTimeout = null; + let hasSimpleMDE = true; if ($editArea.length > 0) { const simplemde = new SimpleMDE({ autoDownloadFontAwesome: false, @@ -1510,6 +1511,12 @@ function initWikiForm() { name: 'revert-to-textarea', action(e) { e.toTextArea(); + hasSimpleMDE = false; + const $form = $('.repository.wiki.new .ui.form'); + const $root = $form.find('.field.content'); + const loading = $root.data('loading'); + $root.append(`
${loading}
`); + initCommentPreviewTab($form); }, className: 'fa fa-file', title: 'Revert to simple textarea', @@ -1524,15 +1531,26 @@ function initWikiForm() { const $toolbar = $('.editor-toolbar'); const $bPreview = $('.editor-toolbar button.preview'); const $bSideBySide = $('.editor-toolbar a.fa-columns'); - $bEdit.on('click', () => { + $bEdit.on('click', (e) => { + if (!hasSimpleMDE) { + return false; + } + e.stopImmediatePropagation(); if ($toolbar.hasClass('disabled-for-preview')) { $bPreview.trigger('click'); } + + return false; }); - $bPrev.on('click', () => { + $bPrev.on('click', (e) => { + if (!hasSimpleMDE) { + return false; + } + e.stopImmediatePropagation(); if (!$toolbar.hasClass('disabled-for-preview')) { $bPreview.trigger('click'); } + return false; }); $bPreview.on('click', () => { setTimeout(() => { @@ -1552,6 +1570,8 @@ function initWikiForm() { } } }, 0); + + return false; }); $bSideBySide.on('click', () => { sideBySideChanges = 10;