zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-01-15 19:51:57 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse source
This commit is contained in:
zadam 2021-12-06 20:57:32 +01:00
commit 67da877135
3 changed files with 40 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/public/app/widgets/quick_search.js
View file

@ -148,6 +148,8 @@ export default class QuickSearchWidget extends BasicWidget {
}
async showInFullSearch() {
this.$dropdownToggle.dropdown("hide");
const searchNote = await dateNotesService.createSearchNote({searchString: this.$searchString.val()});
await froca.loadSearchNote(searchNote.noteId);

28
src/services/search/expressions/note_content_protected_fulltext.js
View file

@ -8,6 +8,7 @@ const protectedSessionService = require('../../protected_session');
const striptags = require('striptags');
const utils = require("../../utils");
// FIXME: create common subclass with NoteContentUnprotectedFulltextExp to avoid duplication
class NoteContentProtectedFulltextExp extends Expression {
constructor(operator, tokens, raw) {
super();
@ -46,15 +47,7 @@ class NoteContentProtectedFulltextExp extends Expression {
continue;
}
content = utils.normalize(content);
if (type === 'text' && mime === 'text/html') {
if (!this.raw && content.length < 20000) { // striptags is slow for very large notes
content = striptags(content);
}
content = content.replace(/&nbsp;/g, ' ');
}
content = this.preprocessContent(content, type, mime);
if (!this.tokens.find(token => !content.includes(token))) {
resultNoteSet.add(becca.notes[noteId]);
@ -63,6 +56,23 @@ class NoteContentProtectedFulltextExp extends Expression {
return resultNoteSet;
}
preprocessContent(content, type, mime) {
content = utils.normalize(content.toString());
if (type === 'text' && mime === 'text/html') {
if (!this.raw && content.length < 20000) { // striptags is slow for very large notes
// allow link to preserve URLs: https://github.com/zadam/trilium/issues/2412
content = striptags(content, ['a']);
// at least the closing tag can be easily stripped
content = content.replace(/<\/a>/ig, "");
}
content = content.replace(/&nbsp;/g, ' ');
}
return content;
}
}
module.exports = NoteContentProtectedFulltextExp;

28
src/services/search/expressions/note_content_unprotected_fulltext.js
View file

@ -6,6 +6,7 @@ const becca = require('../../../becca/becca');
const striptags = require('striptags');
const utils = require("../../utils");
// FIXME: create common subclass with NoteContentProtectedFulltextExp to avoid duplication
class NoteContentUnprotectedFulltextExp extends Expression {
constructor(operator, tokens, raw) {
super();
@ -32,15 +33,7 @@ class NoteContentUnprotectedFulltextExp extends Expression {
continue;
}
content = utils.normalize(content.toString());
if (type === 'text' && mime === 'text/html') {
if (!this.raw && content.length < 20000) { // striptags is slow for very large notes
content = striptags(content);
}
content = content.replace(/&nbsp;/g, ' ');
}
content = this.preprocessContent(content, type, mime);
if (!this.tokens.find(token => !content.includes(token))) {
resultNoteSet.add(becca.notes[noteId]);
@ -49,6 +42,23 @@ class NoteContentUnprotectedFulltextExp extends Expression {
return resultNoteSet;
}
preprocessContent(content, type, mime) {
content = utils.normalize(content.toString());
if (type === 'text' && mime === 'text/html') {
if (!this.raw && content.length < 20000) { // striptags is slow for very large notes
// allow link to preserve URLs: https://github.com/zadam/trilium/issues/2412
content = striptags(content, ['a']);
// at least the closing tag can be easily stripped
content = content.replace(/<\/a>/ig, "");
}
content = content.replace(/&nbsp;/g, ' ');
}
return content;
}
}
module.exports = NoteContentUnprotectedFulltextExp;