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

Show highlighted text in right panel

Browse Source
This commit is contained in:
SiriusXT 2023-06-04 16:02:30 +08:00
parent 3e3d7aa4d7
commit 8852e8e531
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/public/app/widgets/highlighted_text.js
View File

@ -72,11 +72,11 @@ export default class HighlightedTextWidget extends RightPanelWidget {
} }
async refreshWithNote(note) { async refreshWithNote(note) {
/*The reason for adding highlightedTextTemporarilyHiddenPrevious is to record whether the previous state of the highlightedText is hidden or displayed, /*The reason for adding highlightedTextPreviousVisible is to record whether the previous state of the highlightedText is hidden or displayed,
* and then let it be displayed/hidden at the initial time. * and then let it be displayed/hidden at the initial time.
* If there is no such value, when the right panel needs to display toc but not highlighttext, every time the note content is changed, * If there is no such value, when the right panel needs to display toc but not highlighttext, every time the note content is changed,
* highlighttext Widget will appear and then close immediately, because getHlt function will consume time*/ * highlighttext Widget will appear and then close immediately, because getHlt function will consume time*/
if (this.noteContext.viewScope.highlightedTextTemporarilyHiddenPrevious == true) { if (this.noteContext.viewScope.highlightedTextPreviousVisible == true) {
this.toggleInt(true); this.toggleInt(true);
} else { } else {
this.toggleInt(false); this.toggleInt(false);
@ -100,20 +100,19 @@ export default class HighlightedTextWidget extends RightPanelWidget {
this.$hlt.html($hlt); this.$hlt.html($hlt);
if ([undefined, "false"].includes(hltLabel?.value) && hltLiCount > 0) { if ([undefined, "false"].includes(hltLabel?.value) && hltLiCount > 0) {
this.toggleInt(true); this.toggleInt(true);
this.noteContext.viewScope.highlightedTextTemporarilyHiddenPrevious = true; this.noteContext.viewScope.highlightedTextPreviousVisible = true;
} else { } else {
this.toggleInt(false); this.toggleInt(false);
this.noteContext.viewScope.highlightedTextTemporarilyHiddenPrevious = false; this.noteContext.viewScope.highlightedTextPreviousVisible = false;
} }
this.triggerCommand("reEvaluateRightPaneVisibility"); this.triggerCommand("reEvaluateRightPaneVisibility");
} }
/** /**
* Builds a jquery table of helight text. * Builds a table of helight text.
*/ */
getHlt(html, optionsHlt) { getHlt(html, optionsHlt) {
// element priority： span>i>strong>u
// matches a span containing background-color // matches a span containing background-color
const regex1 = /<span[^>]*style\s*=\s*[^>]*background-color:[^>]*?>[\s\S]*?<\/span>/gi; const regex1 = /<span[^>]*style\s*=\s*[^>]*background-color:[^>]*?>[\s\S]*?<\/span>/gi;
// matches a span containing color // matches a span containing color
@ -125,6 +124,7 @@ export default class HighlightedTextWidget extends RightPanelWidget {
// match underline // match underline
const regex5 = /<u>[\s\S]*?<\/u>/g; const regex5 = /<u>[\s\S]*?<\/u>/g;
// Possible values in optionsHlt： '["bold","italic","underline","color","bgColor"]' // Possible values in optionsHlt： '["bold","italic","underline","color","bgColor"]'
// element priority： span>i>strong>u
let findSubStr="", combinedRegexStr = ""; let findSubStr="", combinedRegexStr = "";
if (optionsHlt.indexOf("bgColor") >= 0){ if (optionsHlt.indexOf("bgColor") >= 0){
findSubStr+=`,span[style*="background-color"]`; findSubStr+=`,span[style*="background-color"]`;
@ -157,8 +157,10 @@ export default class HighlightedTextWidget extends RightPanelWidget {
const startIndex = match.index; const startIndex = match.index;
const endIndex = combinedRegex.lastIndex; const endIndex = combinedRegex.lastIndex;
if (prevEndIndex != -1 && startIndex === prevEndIndex) { if (prevEndIndex != -1 && startIndex === prevEndIndex) {
//If the previous element is connected to this element in HTML, then concatenate them into one.
$hlt.children().last().append(subHtml); $hlt.children().last().append(subHtml);
} else { } else {
//hide li if its text content is empty
if ([...subHtml.matchAll(/(?<=^|>)[^><]+?(?=<|$)/g)].map(matchTmp => matchTmp[0]).join('').trim() != ""){ if ([...subHtml.matchAll(/(?<=^|>)[^><]+?(?=<|$)/g)].map(matchTmp => matchTmp[0]).join('').trim() != ""){
var $li = $('<li>'); var $li = $('<li>');
$li.html(subHtml); $li.html(subHtml);

8
src/public/app/widgets/toc.js
View File

@ -84,11 +84,11 @@ export default class TocWidget extends RightPanelWidget {
} }
async refreshWithNote(note) { async refreshWithNote(note) {
/*The reason for adding tocTemporarilyHiddenPrevious is to record whether the previous state of the toc is hidden or displayed, /*The reason for adding tocPreviousVisible is to record whether the previous state of the toc is hidden or displayed,
* and then let it be displayed/hidden at the initial time. If there is no such value, * and then let it be displayed/hidden at the initial time. If there is no such value,
* when the right panel needs to display highlighttext but not toc, every time the note content is changed, * when the right panel needs to display highlighttext but not toc, every time the note content is changed,
* toc will appear and then close immediately, because getToc(html) function will consume time*/ * toc will appear and then close immediately, because getToc(html) function will consume time*/
if (this.noteContext.viewScope.tocTemporarilyHiddenPrevious ==true){ if (this.noteContext.viewScope.tocPreviousVisible ==true){
this.toggleInt(true); this.toggleInt(true);
}else{ }else{
this.toggleInt(false); this.toggleInt(false);
@ -112,10 +112,10 @@ export default class TocWidget extends RightPanelWidget {
this.$toc.html($toc); this.$toc.html($toc);
if (["", "show"].includes(tocLabel?.value) || headingCount >= options.getInt('minTocHeadings')){ if (["", "show"].includes(tocLabel?.value) || headingCount >= options.getInt('minTocHeadings')){
this.toggleInt(true); this.toggleInt(true);
this.noteContext.viewScope.tocTemporarilyHiddenPrevious=true; this.noteContext.viewScope.tocPreviousVisible=true;
}else{ }else{
this.toggleInt(false); this.toggleInt(false);
this.noteContext.viewScope.tocTemporarilyHiddenPrevious=false; this.noteContext.viewScope.tocPreviousVisible=false;
} }
this.triggerCommand("reEvaluateRightPaneVisibility"); this.triggerCommand("reEvaluateRightPaneVisibility");

2
src/public/app/widgets/type_widgets/options/text_notes/highlighted_text.js
View File

@ -16,7 +16,7 @@ const TPL = `
export default class HighlightedTextOptions extends OptionsWidget { export default class HighlightedTextOptions extends OptionsWidget {
doRender() { doRender() {
this.$widget = $(TPL); this.$widget = $(TPL);
this.$hlt = this.$widget.find(".highlighted-text-check"); this.$hlt = this.$widget.find("input.highlighted-text-check");
this.$hlt.on('change', () => { this.$hlt.on('change', () => {
const hltVals=this.$widget.find('input.highlighted-text-check[type="checkbox"]:checked').map(function() { const hltVals=this.$widget.find('input.highlighted-text-check[type="checkbox"]:checked').map(function() {
return this.value; return this.value;