gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 05:28:59 +01:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
zadam 2022-11-01 19:10:16 +01:00
commit eb68ab6776
4 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "trilium", "name": "trilium",
"version": "0.56.1", "version": "0.56.2",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "trilium", "name": "trilium",
"version": "0.56.1", "version": "0.56.2",
"hasInstallScript": true, "hasInstallScript": true,
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"dependencies": { "dependencies": {

25
src/public/app/widgets/find.js
View File

@ -142,26 +142,27 @@ export default class FindWidget extends NoteContextAwareWidget {
return; return;
} }
if (!['text', 'code', 'render'].includes(this.note.type) || !this.$findBox.is(":hidden")) { if (!['text', 'code', 'render'].includes(this.note.type)) {
return; return;
} }
this.handler = await this.getHandler();
this.$findBox.show(); this.$findBox.show();
this.$input.focus(); this.$input.focus();
this.$totalFound.text(0); this.handler = await this.getHandler();
this.$currentFound.text(0);
const searchTerm = await this.handler.getInitialSearchTerm(); const isAlreadyVisible = this.$findBox.is(":visible");
this.$input.val(searchTerm || ""); if (isAlreadyVisible) {
// Directly perform the search if there's some text to
// find, without delaying or waiting for enter
if (searchTerm !== "") {
this.$input.select(); this.$input.select();
await this.performFind(); } else {
this.$totalFound.text(0);
this.$currentFound.text(0);
const searchTerm = await this.handler.getInitialSearchTerm();
this.$input.val(searchTerm || "");
if (searchTerm !== "") {
this.$input.select();
await this.performFind();
}
} }
} }

2
src/public/app/widgets/note_tree.js
View File

@ -1462,7 +1462,7 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
clipboard.pasteInto(node.data.branchId); clipboard.pasteInto(node.data.branchId);
} }
pasteNotesAfterFromClipboard({node}) { pasteNotesAfterFromClipboardCommand({node}) {
clipboard.pasteAfter(node.data.branchId); clipboard.pasteAfter(node.data.branchId);
} }

7
src/share/routes.js
View File

@ -111,7 +111,12 @@ function register(router) {
router.use('/share/canvas_share.js', express.static(path.join(__dirname, 'canvas_share.js'))); router.use('/share/canvas_share.js', express.static(path.join(__dirname, 'canvas_share.js')));
router.get(['/share', '/share/'], (req, res, next) => { router.get('/share/', (req, res, next) => {
if (req.path.substr(-1) !== '/') {
res.redirect('../share/');
return;
}
shacaLoader.ensureLoad(); shacaLoader.ensureLoad();
renderNote(shaca.shareRootNote, req, res); renderNote(shaca.shareRootNote, req, res);