zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-01-30 19:08:55 +08:00
Code Issues Projects Releases Packages Wiki Activity

workaround for CKEditor bug with setting empty data

Browse source
This commit is contained in:
azivner 2018-01-09 20:01:02 -05:00
parent 0bdf900e2e
commit 58362405c6
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bin/build.sh
View file

@ -4,11 +4,6 @@ echo "Deleting existing builds"
rm -r dist/* rm -r dist/*
echo "Rebuilding binaries for linux-x64"
./node_modules/.bin/electron-rebuild --arch=x64
./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=x64 --overwrite
echo "Rebuilding binaries for linux-ia32" echo "Rebuilding binaries for linux-ia32"
./node_modules/.bin/electron-rebuild --arch=ia32 ./node_modules/.bin/electron-rebuild --arch=ia32
@ -16,6 +11,12 @@ echo "Rebuilding binaries for linux-ia32"
./node_modules/.bin/electron-packager . --out=dist --platform=win32 --arch=x64 --overwrite ./node_modules/.bin/electron-packager . --out=dist --platform=win32 --arch=x64 --overwrite
# we build x64 as second so that we keep X64 binaries in node_modules for local development
echo "Rebuilding binaries for linux-x64"
./node_modules/.bin/electron-rebuild --arch=x64
./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=x64 --overwrite
echo "Copying required windows binaries" echo "Copying required windows binaries"
WIN_RES_DIR=./dist/trilium-win32-x64/resources/app WIN_RES_DIR=./dist/trilium-win32-x64/resources/app

3
public/javascripts/note_editor.js
View file

@ -121,7 +121,8 @@ const noteEditor = (function() {
noteTitleEl.val(currentNote.detail.note_title); noteTitleEl.val(currentNote.detail.note_title);
editor.setData(currentNote.detail.note_text); // temporary workaround for https://github.com/ckeditor/ckeditor5-enter/issues/49
editor.setData(currentNote.detail.note_text ? currentNote.detail.note_text : "<p></p>");
noteChangeDisabled = false; noteChangeDisabled = false;