mirror of
https://github.com/zadam/trilium.git
synced 2025-11-01 02:45:54 +01:00
Compare commits
7 Commits
v0.45.0-be
...
v0.45.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5f20d033a8 | ||
|
|
93d0324177 | ||
|
|
0afd3c65aa | ||
|
|
8901c3ec91 | ||
|
|
c671b0a345 | ||
|
|
9f424836e2 | ||
|
|
7f5af4b959 |
2
package-lock.json
generated
2
package-lock.json
generated
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "trilium",
|
"name": "trilium",
|
||||||
"version": "0.44.9",
|
"version": "0.45.0-beta",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"name": "trilium",
|
"name": "trilium",
|
||||||
"productName": "Trilium Notes",
|
"productName": "Trilium Notes",
|
||||||
"description": "Trilium Notes",
|
"description": "Trilium Notes",
|
||||||
"version": "0.45.0-beta",
|
"version": "0.45.1",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"main": "electron.js",
|
"main": "electron.js",
|
||||||
"bin": {
|
"bin": {
|
||||||
|
|||||||
@@ -115,13 +115,13 @@ export default class TabManager extends Component {
|
|||||||
|
|
||||||
// using pushState instead of directly modifying document.location because it does not trigger hashchange
|
// using pushState instead of directly modifying document.location because it does not trigger hashchange
|
||||||
window.history.pushState(null, "", url);
|
window.history.pushState(null, "", url);
|
||||||
|
}
|
||||||
|
|
||||||
document.title = "Trilium Notes";
|
document.title = "Trilium Notes";
|
||||||
|
|
||||||
if (activeTabContext.note) {
|
if (activeTabContext.note) {
|
||||||
// it helps navigating in history if note title is included in the title
|
// it helps navigating in history if note title is included in the title
|
||||||
document.title += " - " + activeTabContext.note.title;
|
document.title += " - " + activeTabContext.note.title;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
this.triggerEvent('activeNoteChanged'); // trigger this even in on popstate event
|
this.triggerEvent('activeNoteChanged'); // trigger this even in on popstate event
|
||||||
|
|||||||
@@ -20,6 +20,9 @@ class TreeCache {
|
|||||||
async loadInitialTree() {
|
async loadInitialTree() {
|
||||||
const resp = await server.get('tree');
|
const resp = await server.get('tree');
|
||||||
|
|
||||||
|
// FIXME: we need to do this to cover for ascendants of template notes which are not loaded
|
||||||
|
await this.loadParents(resp, false);
|
||||||
|
|
||||||
// clear the cache only directly before adding new content which is important for e.g. switching to protected session
|
// clear the cache only directly before adding new content which is important for e.g. switching to protected session
|
||||||
|
|
||||||
/** @type {Object.<string, NoteShort>} */
|
/** @type {Object.<string, NoteShort>} */
|
||||||
@@ -40,6 +43,8 @@ class TreeCache {
|
|||||||
async loadSubTree(subTreeNoteId) {
|
async loadSubTree(subTreeNoteId) {
|
||||||
const resp = await server.get('tree?subTreeNoteId=' + subTreeNoteId);
|
const resp = await server.get('tree?subTreeNoteId=' + subTreeNoteId);
|
||||||
|
|
||||||
|
await this.loadParents(resp, true);
|
||||||
|
|
||||||
this.addResp(resp);
|
this.addResp(resp);
|
||||||
|
|
||||||
return this.notes[subTreeNoteId];
|
return this.notes[subTreeNoteId];
|
||||||
@@ -191,8 +196,8 @@ class TreeCache {
|
|||||||
if (note.type === 'search') {
|
if (note.type === 'search') {
|
||||||
const searchResultNoteIds = await server.get('search-note/' + note.noteId);
|
const searchResultNoteIds = await server.get('search-note/' + note.noteId);
|
||||||
|
|
||||||
if (!searchResultNoteIds) {
|
if (!Array.isArray(searchResultNoteIds)) {
|
||||||
throw new Error(`Search note ${note.noteId} failed.`);
|
throw new Error(`Search note ${note.noteId} failed: ${searchResultNoteIds}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
// force to load all the notes at once instead of one by one
|
// force to load all the notes at once instead of one by one
|
||||||
|
|||||||
@@ -283,7 +283,9 @@ export default class AttributeDetailWidget extends TabAwareWidget {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.attribute.value = suggestion.notePath;
|
const pathChunks = suggestion.notePath.split('/');
|
||||||
|
|
||||||
|
this.attribute.value = pathChunks[pathChunks.length - 1]; // noteId
|
||||||
|
|
||||||
this.triggerCommand('updateAttributeList', { attributes: this.allAttributes });
|
this.triggerCommand('updateAttributeList', { attributes: this.allAttributes });
|
||||||
this.updateRelatedNotes();
|
this.updateRelatedNotes();
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
addTextToActiveEditorEvent(text) {
|
addTextToActiveEditorEvent({text}) {
|
||||||
if (!this.isActive()) {
|
if (!this.isActive()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,8 @@ async function searchFromNote(req) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (note.isDeleted) {
|
if (note.isDeleted) {
|
||||||
return [400, `Note ${req.params.noteId} is deleted.`];
|
// this can be triggered from recent changes and it's harmless to return empty list rather than fail
|
||||||
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (note.type !== 'search') {
|
if (note.type !== 'search') {
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
module.exports = { buildDate:"2020-10-21T22:57:54+02:00", buildRevision: "283808d69181628b84d7d48b5029c51bc5a1cf98" };
|
module.exports = { buildDate:"2020-10-26T22:51:10+01:00", buildRevision: "93d0324177a34cb79caf410ff7fc14a18c4f2633" };
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ const htmlSanitizer = require('../html_sanitizer');
|
|||||||
* @param {Note} parentNote
|
* @param {Note} parentNote
|
||||||
* @return {Promise<*[]|*>}
|
* @return {Promise<*[]|*>}
|
||||||
*/
|
*/
|
||||||
function importOpml(taskContext, fileBuffer, parentNote) {
|
async function importOpml(taskContext, fileBuffer, parentNote) {
|
||||||
const xml = new Promise(function(resolve, reject)
|
const xml = await new Promise(function(resolve, reject)
|
||||||
{
|
{
|
||||||
parseString(fileBuffer, function (err, result) {
|
parseString(fileBuffer, function (err, result) {
|
||||||
if (err) {
|
if (err) {
|
||||||
|
|||||||
Reference in New Issue
Block a user