release 0.33.4

Build failed without python for arm

Dockerfile

@@ -18,6 +18,7 @@ RUN set -x \
         make \
         nasm \
         libpng-dev \
+        python \
     && npm install --production \
     && apk del .build-dependencies
 

bin/build-linux-x64.sh

@@ -7,6 +7,9 @@ rm -r node_modules/sqlite3/lib/binding/*
 
 cp -r bin/deps/linux-x64/sqlite/* node_modules/sqlite3/lib/binding/
 
+# rebuild binaries for image operations (pngquant ...)
+npm rebuild
+
 ./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
 
 mv "./dist/Trilium Notes-linux-x64" $BUILD_DIR

electron.js

@@ -59,7 +59,7 @@ async function createMainWindow() {
     mainWindowState.manage(win);
 
     win.setMenuBarVisibility(false);
-    win.loadURL('http://localhost:' + await port);
+    win.loadURL('http://127.0.0.1:' + await port);
     win.on('closed', onClosed);
 
     win.webContents.on('new-window', (e, url) => {
@@ -74,7 +74,7 @@ async function createMainWindow() {
         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 !== '/')) {
+        if (!['localhost', '127.0.0.1'].includes(parsedUrl.hostname) || (parsedUrl.path && parsedUrl.path !== '/')) {
             ev.preventDefault();
         }
     });

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.33.1-beta",
+  "version": "0.33.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2820,9 +2820,9 @@
       "integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q=="
     },
     "electron": {
-      "version": "6.0.0-beta.9",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-6.0.0-beta.9.tgz",
-      "integrity": "sha512-tbBpSamFzD1ayJhF+sUo56e7qD+djdMOPh8B0iA0C10pYbi0HUSEH1EOLtB+UMWU3wkc8QOCMWcgz7wze1w6QQ==",
+      "version": "6.0.0-beta.11",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-6.0.0-beta.11.tgz",
+      "integrity": "sha512-B6zh9c5pJ0BKKNkOEbF6vKXnBCWgtvY8LaUYDNeR9ttnPP0CCm0oovIoqP9/nN5gL8rlCoCgKWsjmiHu0jg7mA==",
       "dev": true,
       "requires": {
         "@types/node": "^10.12.18",

package.json

@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.33.2-beta",
+  "version": "0.33.4",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {
@@ -75,7 +75,7 @@
   },
   "devDependencies": {
     "devtron": "1.4.0",
-    "electron": "6.0.0-beta.9",
+    "electron": "6.0.0-beta.11",
     "electron-builder": "20.44.2",
     "electron-compile": "6.4.4",
     "electron-installer-debian": "2.0.0",

src/public/javascripts/services/messaging.js

@@ -88,10 +88,13 @@ setTimeout(() => {
             console.log("Lost connection to server");
         }
 
+        try {
             ws.send(JSON.stringify({
                 type: 'ping',
                 lastSyncId: lastSyncId
             }));
+        }
+        catch (e) {} // if the connection is closed then this produces a lot of messages
     }, 1000);
 }, 0);
 

src/public/javascripts/services/note_detail.js

@@ -401,11 +401,14 @@ tabRow.addListener('activeTabChange', async ({ detail }) => {
 tabRow.addListener('tabRemove', async ({ detail }) => {
     const tabId = detail.tabEl.getAttribute('data-tab-id');
 
-    const tabContentToDelete = tabContexts.find(nc => nc.tabId === tabId);
+    const tabContextToDelete = tabContexts.find(nc => nc.tabId === tabId);
 
-    if (tabContentToDelete) {
-        await tabContentToDelete.saveNoteIfChanged();
-        tabContentToDelete.$tabContent.remove();
+    if (tabContextToDelete) {
+        // sometimes there are orphan autocompletes after closing the tab
+        tabContextToDelete.closeAutocomplete();
+
+        await tabContextToDelete.saveNoteIfChanged();
+        tabContextToDelete.$tabContent.remove();
     }
 
     tabContexts = tabContexts.filter(nc => nc.tabId !== tabId);

src/public/javascripts/services/tab_context.js

@@ -67,12 +67,18 @@ class TabContext {
         this.components = {};
 
         this.$noteTitle.on('input', () => {
+            if (!this.note) {
+                return;
+            }
+
             this.noteChanged();
 
-            const title = this.$noteTitle.val();
+            this.note.title = this.$noteTitle.val();
 
-            this.tabRow.updateTab(this.$tab[0], {title});
-            treeService.setNoteTitle(this.noteId, title);
+            this.tabRow.updateTab(this.$tab[0], {title: this.note.title});
+            treeService.setNoteTitle(this.noteId, this.note.title);
+
+            this.setTitleBar();
         });
 
         if (utils.isDesktop()) {
@@ -103,6 +109,8 @@ class TabContext {
 
         this.setTitleBar();
 
+        this.closeAutocomplete(); // esp. on windows autocomplete is not getting closed automatically
+
         setTimeout(async () => {
             // we include the note into recent list only if the user stayed on the note at least 5 seconds
             if (notePath && notePath === this.notePath) {
@@ -328,6 +336,10 @@ class TabContext {
             }
         }
     }
+
+    closeAutocomplete() {
+        this.$tabContent.find('.aa-input').autocomplete('close');
+    }
 }
 
 export default TabContext;

src/services/build.js

@@ -1 +1 @@
-module.exports = { buildDate:"2019-06-20T09:39:11+02:00", buildRevision: "fead3cd7ade63620655376dc5e85b4308ec71bde" };
+module.exports = { buildDate:"2019-06-26T21:20:30+02:00", buildRevision: "a3951f1cce978699d81f312c590d71f6ca4c6771" };

src/views/dialogs/link_map.ejs

@@ -36,9 +36,13 @@
                     </div>
                 </div>
 
+                <div style="display: inline-block;">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="margin-left: 0;">
                         <span aria-hidden="true">&times;</span>
                     </button>
+
+                    <button class="help-button" type="button" data-help-page="Link-map" title="Help on Link map">?</button>
+                </div>
             </div>
             <div class="modal-body" style="outline: none; overflow: hidden;">
                 <div id="link-map-container"></div>