gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 01:48:32 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
zadam 2020-01-24 22:30:17 +01:00
parent 7d9b720ea8
commit 7a62d1636b
18 changed files with 44 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM node:12.14.0-alpine
FROM node:12.14.1-alpine
# Create app directory
WORKDIR /usr/src/app

2
bin/build-server.sh
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash
PKG_DIR=dist/trilium-linux-x64-server
NODE_VERSION=12.14.0
NODE_VERSION=12.14.1
if [ "$1" != "DONTCOPY" ]
then

4
src/public/javascripts/services/app_context.js
View File

@ -105,7 +105,7 @@ class AppContext {
new TabCachingWidget(this, () => new LinkMapWidget(this)),
new TabCachingWidget(this, () => new NoteRevisionsWidget(this)),
new TabCachingWidget(this, () => new SimilarNotesWidget(this)),
new TabCachingWidget(this, () => new WhatLinksHereWidget(this)),
new TabCachingWidget(this, () => new WhatLinksHereWidget(this))
];
for (const widget of rightPaneWidgets) {
@ -320,7 +320,7 @@ class AppContext {
this.activeTabId = tabId;
this.trigger('activeTabChanged', { oldActiveTabId });
this.trigger('activeTabChanged', { oldActiveTabId, newActiveTabId: tabId });
}
newTabListener() {

17
src/public/javascripts/services/spaced_update.js
View File

@ -7,8 +7,10 @@ export default class SpacedUpdate {
}
scheduleUpdate() {
this.changed = true;
setTimeout(() => this.triggerUpdate())
if (!this.changeForbidden) {
this.changed = true;
setTimeout(() => this.triggerUpdate());
}
}
async updateNowIfNecessary() {
@ -33,4 +35,15 @@ export default class SpacedUpdate {
this.scheduleUpdate();
}
}
allowUpdateWithoutChange(callback) {
this.changeForbidden = true;
try {
callback();
}
finally {
this.changeForbidden = false;
}
}
}

2
src/public/javascripts/widgets/component.js
View File

@ -11,7 +11,7 @@ export default class Component {
async eventReceived(name, data, sync = false) {
await this.initialized;
// console.log(`Received ${name} to ${this.componentId}`);
console.log(`Received ${name} to ${this.componentId}`);
const fun = this[name + 'Listener'];

5
src/public/javascripts/widgets/note_detail.js
View File

@ -138,12 +138,11 @@ export default class NoteDetailWidget extends TabAwareWidget {
const clazz = await import(typeWidgetClasses[type]);
const typeWidget = this.typeWidgets[type] = new clazz.default(this.appContext);
typeWidget.spacedUpdate = this.spacedUpdate;
this.children.push(typeWidget);
this.$widget.append(typeWidget.render());
typeWidget.onNoteChange(() => this.spacedUpdate.scheduleUpdate());
typeWidget.eventReceived('setTabContext', {tabContext: this.tabContext});
}

4
src/public/javascripts/widgets/tab_row.js
View File

@ -464,8 +464,8 @@ export default class TabRowWidget extends BasicWidget {
return !!this.activeTabEl;
}
activeTabChangedListener({tabId}) {
const tabEl = this.getTabById(tabId)[0];
activeTabChangedListener({newActiveTabId}) {
const tabEl = this.getTabById(newActiveTabId)[0];
const activeTabEl = this.activeTabEl;
if (activeTabEl === tabEl) return;
if (activeTabEl) activeTabEl.removeAttribute('active');

7
src/public/javascripts/widgets/type_widgets/book.js
View File

@ -39,6 +39,7 @@ const TPL = `
.note-detail-book {
height: 100%;
padding: 10px;
position: relative;
}
.note-detail-book-content {
@ -280,14 +281,8 @@ export default class BookTypeWidget extends TypeWidget {
return "";
}
show() {
this.$widget.show();
}
focus() {}
onNoteChange() {}
cleanup() {
this.$content.empty();
}

26
src/public/javascripts/widgets/type_widgets/code.js
View File

@ -68,20 +68,22 @@ export default class CodeTypeWidget extends TypeWidget {
dragDrop: false // with true the editor inlines dropped files which is not what we expect
});
//this.onNoteChange(() => this.tabContext.noteChanged());
this.codeEditor.on('change', () => this.spacedUpdate.scheduleUpdate());
}
doRefresh(note) {
// CodeMirror breaks pretty badly on null so even though it shouldn't happen (guarded by consistency check)
// we provide fallback
this.codeEditor.setValue(note.content || "");
this.spacedUpdate.allowUpdateWithoutChange(() => {
// CodeMirror breaks pretty badly on null so even though it shouldn't happen (guarded by consistency check)
// we provide fallback
this.codeEditor.setValue(note.content || "");
const info = CodeMirror.findModeByMIME(note.mime);
const info = CodeMirror.findModeByMIME(note.mime);
if (info) {
this.codeEditor.setOption("mode", info.mime);
CodeMirror.autoLoadMode(this.codeEditor, info.mode);
}
if (info) {
this.codeEditor.setOption("mode", info.mime);
CodeMirror.autoLoadMode(this.codeEditor, info.mode);
}
});
this.show();
}
@ -123,12 +125,6 @@ export default class CodeTypeWidget extends TypeWidget {
toastService.showMessage("Note executed");
}
async onNoteChange(func) {
await this.initialized;
this.codeEditor.on('change', func);
}
cleanup() {
if (this.codeEditor) {
this.codeEditor.setValue('');

4
src/public/javascripts/widgets/type_widgets/empty.js
View File

@ -40,14 +40,10 @@ export default class EmptyTypeWidget extends TypeWidget {
this.toggle(!this.tabContext.note);
}
show() {}
getContent() {}
focus() {}
onNoteChange() {}
cleanup() {}
scrollToTop() {}

4
src/public/javascripts/widgets/type_widgets/file.js
View File

@ -144,14 +144,10 @@ export default class FileTypeWidget extends TypeWidget {
return utils.getUrlForDownload("api/notes/" + this.tabContext.note.noteId + "/download");
}
show() {}
getContent() {}
focus() {}
onNoteChange() {}
cleanup() {}
scrollToTop() {}

4
src/public/javascripts/widgets/type_widgets/image.js
View File

@ -149,14 +149,10 @@ class NoteDetailImage extends TypeWidget {
return utils.getUrlForDownload(`api/notes/${this.tabContext.note.noteId}/download`);
}
show() {}
getContent() {}
focus() {}
onNoteChange() {}
cleanup() {}
scrollToTop() {

4
src/public/javascripts/widgets/type_widgets/protected_session.js
View File

@ -40,14 +40,10 @@ export default class ProtectedSessionTypeWidget extends TypeWidget {
return this.$widget;
}
show() {}
getContent() {}
focus() {}
onNoteChange() {}
cleanup() {}
scrollToTop() {

4
src/public/javascripts/widgets/type_widgets/relation_map.js
View File

@ -644,11 +644,7 @@ export default class RelationMapTypeWidget extends TypeWidget {
return JSON.stringify(this.mapData);
}
show() {}
focus() {}
onNoteChange() {}
scrollToTop() {}
}

4
src/public/javascripts/widgets/type_widgets/render.js
View File

@ -40,12 +40,8 @@ export default class RenderTypeWidget extends TypeWidget {
getContent() {}
show() {}
focus() {}
onNoteChange() {}
cleanup() {
this.$noteDetailRenderContent.empty();
}

4
src/public/javascripts/widgets/type_widgets/search.js
View File

@ -65,10 +65,6 @@ export default class SearchTypeWidget extends TypeWidget {
focus() {}
show() {}
onNoteChange() {}
cleanup() {}
scrollToTop() {}

14
src/public/javascripts/widgets/type_widgets/text.js
View File

@ -128,6 +128,8 @@ export default class TextTypeWidget extends TypeWidget {
}
});
this.textEditor.model.document.on('change:data', () => this.spacedUpdate.scheduleUpdate());
if (glob.isDev && ENABLE_INSPECTOR) {
await import('../../libraries/ckeditor/inspector.js');
CKEditorInspector.attach(this.textEditor);
@ -137,9 +139,9 @@ export default class TextTypeWidget extends TypeWidget {
async doRefresh(note) {
this.textEditor.isReadOnly = await this.isReadOnly();
this.$widget.show();
this.textEditor.setData(note.content);
this.spacedUpdate.allowUpdateWithoutChange(() => {
this.textEditor.setData(note.content);
});
}
getContent() {
@ -174,12 +176,6 @@ export default class TextTypeWidget extends TypeWidget {
return this.textEditor;
}
async onNoteChange(func) {
await this.initialized;
this.textEditor.model.document.on('change:data', func);
}
cleanup() {
if (this.textEditor) {
this.textEditor.setData('');

4
src/services/ws.js
View File

@ -92,7 +92,9 @@ async function fillInAdditionalProperties(sync) {
}
async function sendPing(client) {
const syncData = require('./sync_table').getEntitySyncsNewerThan(lastAcceptedSyncIds[client.id]);
const syncData = require('./sync_table')
.getEntitySyncsNewerThan(lastAcceptedSyncIds[client.id])
.filter(r => r.entityName !== 'recent_notes'); // only noise ...
for (const sync of syncData) {
try {