From 58362405c6a376a1cde550376d9891929f54e46a Mon Sep 17 00:00:00 2001 From: azivner Date: Tue, 9 Jan 2018 20:01:02 -0500 Subject: [PATCH] workaround for CKEditor bug with setting empty data --- bin/build.sh | 11 ++++++----- public/javascripts/note_editor.js | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bin/build.sh b/bin/build.sh index 991cdc938..e62582618 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -4,11 +4,6 @@ echo "Deleting existing builds" 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" ./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 +# 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" WIN_RES_DIR=./dist/trilium-win32-x64/resources/app diff --git a/public/javascripts/note_editor.js b/public/javascripts/note_editor.js index 0dd06f96d..7209c1c62 100644 --- a/public/javascripts/note_editor.js +++ b/public/javascripts/note_editor.js @@ -121,7 +121,8 @@ const noteEditor = (function() { 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 : "

"); noteChangeDisabled = false;