diff options
Diffstat (limited to 'web_src')
| -rw-r--r-- | web_src/js/features/codeeditor.js | 10 | ||||
| -rw-r--r-- | web_src/js/features/repo-editor.js | 7 |
2 files changed, 8 insertions, 9 deletions
diff --git a/web_src/js/features/codeeditor.js b/web_src/js/features/codeeditor.js index 23a26ba2b0..4f5ea317b4 100644 --- a/web_src/js/features/codeeditor.js +++ b/web_src/js/features/codeeditor.js @@ -130,17 +130,17 @@ function getFileBasedOptions(filename, lineWrapExts) { }; } -export async function createCodeEditor(textarea, filenameInput, previewFileModes) { +export async function createCodeEditor(textarea, filenameInput) { const filename = basename(filenameInput.value); const previewLink = document.querySelector('a[data-tab=preview]'); - const markdownExts = (textarea.getAttribute('data-markdown-file-exts') || '').split(','); + const previewableExts = (textarea.getAttribute('data-previewable-extensions') || '').split(','); const lineWrapExts = (textarea.getAttribute('data-line-wrap-extensions') || '').split(','); - const isMarkdown = markdownExts.includes(extname(filename)); + const previewable = previewableExts.includes(extname(filename)); const editorConfig = getEditorconfig(filenameInput); if (previewLink) { - if (isMarkdown && (previewFileModes || []).includes('markdown')) { - const newUrl = (previewLink.getAttribute('data-url') || '').replace(/(.*)\/.*/i, `$1/markdown`); + if (previewable) { + const newUrl = (previewLink.getAttribute('data-url') || '').replace(/(.*)\/.*/i, `$1/markup`); previewLink.setAttribute('data-url', newUrl); previewLink.style.display = ''; } else { diff --git a/web_src/js/features/repo-editor.js b/web_src/js/features/repo-editor.js index b3e9b65f21..a7c59fb039 100644 --- a/web_src/js/features/repo-editor.js +++ b/web_src/js/features/repo-editor.js @@ -5,18 +5,16 @@ import {createCodeEditor} from './codeeditor.js'; import {hideElem, showElem} from '../utils/dom.js'; const {csrfToken} = window.config; -let previewFileModes; function initEditPreviewTab($form) { const $tabMenu = $form.find('.tabular.menu'); $tabMenu.find('.item').tab(); const $previewTab = $tabMenu.find(`.item[data-tab="${$tabMenu.data('preview')}"]`); if ($previewTab.length) { - previewFileModes = $previewTab.data('preview-file-modes').split(','); $previewTab.on('click', function () { const $this = $(this); let context = `${$this.data('context')}/`; - const mode = $this.data('markdown-mode') || 'comment'; + const mode = $this.data('markup-mode') || 'comment'; const treePathEl = $form.find('input#tree_path'); if (treePathEl.length > 0) { context += treePathEl.val(); @@ -27,6 +25,7 @@ function initEditPreviewTab($form) { mode, context, text: $form.find(`.tab[data-tab="${$tabMenu.data('write')}"] textarea`).val(), + file_path: treePathEl.val(), }, (data) => { const $previewPanel = $form.find(`.tab[data-tab="${$tabMenu.data('preview')}"]`); $previewPanel.html(data); @@ -147,7 +146,7 @@ export function initRepoEditor() { if (!$editArea.length) return; (async () => { - const editor = await createCodeEditor($editArea[0], $editFilename[0], previewFileModes); + const editor = await createCodeEditor($editArea[0], $editFilename[0]); // Using events from https://github.com/codedance/jquery.AreYouSure#advanced-usage // to enable or disable the commit button |