diff options
author | silverwind <me@silverwind.io> | 2020-11-14 04:57:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-13 22:57:34 -0500 |
commit | 374ff60465ace2471d0dde121c6a3e1527ab0bec (patch) | |
tree | 76070c023124891a4ee08da8b5db01e13bf90d65 /web_src/js/index.js | |
parent | a2efcb6acc85dbd231c402a4c308e76289d06cbd (diff) | |
download | gitea-374ff60465ace2471d0dde121c6a3e1527ab0bec.tar.gz gitea-374ff60465ace2471d0dde121c6a3e1527ab0bec.zip |
Use monaco for the git hook editor (#13552)
Migrate git hook editor to monaco, replacing CodeMirror. Had to do a few
refactors to make the monaco instantiation generic enough to be of use.
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'web_src/js/index.js')
-rw-r--r-- | web_src/js/index.js | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/web_src/js/index.js b/web_src/js/index.js index 08305043d4..1d36dcf6b2 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -23,7 +23,7 @@ import createDropzone from './features/dropzone.js'; import initTableSort from './features/tablesort.js'; import ActivityTopAuthors from './components/ActivityTopAuthors.vue'; import {initNotificationsTable, initNotificationCount} from './features/notification.js'; -import {createCodeEditor} from './features/codeeditor.js'; +import {createCodeEditor, createMonaco} from './features/codeeditor.js'; import {svg, svgs} from './svg.js'; import {stripTags} from './utils.js'; @@ -1732,15 +1732,10 @@ function initUserSettings() { } } -function initGithook() { - if ($('.edit.githook').length === 0) { - return; - } - - CodeMirror.autoLoadMode(CodeMirror.fromTextArea($('#content')[0], { - lineNumbers: true, - mode: 'shell' - }), 'shell'); +async function initGithook() { + if ($('.edit.githook').length === 0) return; + const filename = document.querySelector('.hook-filename').textContent; + await createMonaco($('#content')[0], filename, {language: 'shell'}); } function initWebhook() { @@ -2517,7 +2512,6 @@ $(document).ready(async () => { initEditForm(); initEditor(); initOrganization(); - initGithook(); initWebhook(); initAdmin(); initCodeView(); @@ -2575,6 +2569,7 @@ $(document).ready(async () => { initServiceWorker(), initNotificationCount(), renderMarkdownContent(), + initGithook(), ]); }); |