release 0.3.3

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

index.js

@@ -2,6 +2,7 @@
 const electron = require('electron');
 const path = require('path');
 const config = require('./services/config');
+const url = require("url");
 
 const app = electron.app;
 
@@ -38,6 +39,16 @@ function createMainWindow() {
         }
     });
 
+    // prevent drag & drop to navigate away from trilium
+    win.webContents.on('will-navigate', (ev, targetUrl) => {
+        const parsedUrl = url.parse(targetUrl);
+
+        // we still need to allow internal redirects from setup and migration pages
+        if (parsedUrl.hostname !== 'localhost' || (parsedUrl.path && parsedUrl.path !== '/')) {
+            ev.preventDefault();
+        }
+    });
+
     return win;
 }
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "trilium",
   "description": "Trilium Notes",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "license": "AGPL-3.0-only",
   "repository": {
     "type": "git",

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 : "<p></p>");
 
         noteChangeDisabled = false;
 

services/build.js

@@ -1 +1 @@
-module.exports = { build_date:"2018-01-08T23:35:02-05:00", build_revision: "90de4b8600894787907dd30c20982ab9be946657" };
+module.exports = { build_date:"2018-01-12T23:30:47-05:00", build_revision: "92271a84b78c8adfa5da57392520a659e61377bc" };