jody/notes.kaplon.us
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove codemirror build step from Dockerfile so it builds on janus & i can get app running again; add vim config to index view (not fully working).

Browse Source
This commit is contained in:
Jody 2024-09-14 15:32:27 -04:00
parent 980a5bef2f
commit 891918e050
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,4 +1,4 @@
FROM node:12-alpine
FROM node:18.18.2-alpine
EXPOSE 3000
@ -17,7 +17,7 @@ RUN npm install
# To upgrade, in host CodeMirror dir, do `git pull` and `git checkout tags/###`.
# Running `npm run build` here to save a step.
RUN cd /usr/src/app/CodeMirror && npm run build
#RUN cd /usr/src/app/CodeMirror && npm run build
# Use nodemon to start app.
CMD [ "nodemon" ]

29
views/index.html
View File

@ -81,6 +81,35 @@
//CodeMirror.Vim.map(' x', '<ESC>;s/\[\s\]/[x]/g<CR>;noh<CR>', 'normal')
//CodeMirror.Vim.map('xx', '<ESC>;s/\[\s\]/[x]/g<CR>;noh<CR>', 'normal')
//CodeMirror.Vim.map('xx', '<ESC>;s/\[\s\]/[x]/g<CR>;noh<CR>', 'insert')
// Add my .vimrc stuff.
const { Vim } = CodeMirror;
Vim.map('jj', '<Esc>', 'insert');
Vim.map(';', ':', 'normal');
Vim.unmap('<Space>');
Vim.map('<Space><Space>', 'l');
Vim.defineAction('ghMdCkBxAdd', (cm, args) => {
// Based on review of vim_test.js code, replaceRange() needed for insert mode.
// Note replaceRange() and getCursor() are methods on cm object, not Vim object (maybe clean this up later).
// doKeys() func in vim_test.js would also type into insert mode, but i don't understand it.
Vim.handleKey(cm, 'o');
Vim.handleKey(cm, '<Esc>');
cm.replaceRange('- [ ] ', cm.getCursor());
Vim.handleKey(cm, 'A');
});
Vim.mapCommand('<Space>c', 'action', 'ghMdCkBxAdd');
Vim.defineAction('ghMdCkBx', (cm, args) => {
// This substitution works using exec-cmd in editor, but not here (it subs the 's'-char)x..
Vim.handleEx(cm, 's/\[\s\]/[x]');
// Try switch to sub any single character, also works in editor, not here (gives a msg 'No matches for [.]').
//Vim.handleEx(cm, 's/\[\.\]/[x]');
Vim.handleEx(cm, 'noh');
Vim.handleKey(cm, 'h');
Vim.handleKey(cm, 'j');
Vim.handleKey(cm, 'j');
});
Vim.mapCommand('<Space>x', 'action', 'ghMdCkBx');
CodeMirror.commands.save = function(){
socket.emit('cm-save', 'codemirror save event');
}