Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 03:46:37 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	src/routes/api/sender.js
#	src/services/import/enex.js
This commit is contained in:
zadam
2023-01-10 16:33:31 +01:00
parent 2242397280 5bf9c253f2
commit edbb60f2b5
10 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,7 @@ export default class TocWidget extends RightPanelWidget {
getToc(html) {
// Regular expression for headings <h1>...</h1> using non-greedy
// matching and backreferences
const headingTagsRegex = /<h(\d+)>(.*?)<\/h\1>/g;
const headingTagsRegex = /<h(\d+)[^>]*>(.*?)<\/h\1>/gi;
// Use jquery to build the table rather than html text, since it makes
// it easier to set the onclick event that will be executed with the
@@ -151,7 +151,8 @@ export default class TocWidget extends RightPanelWidget {
}
} else if (levelDelta < 0) {
// Close as many lists as curLevel - newLevel
for (let i = 0; i < -levelDelta; ++i) {
// be careful not to empty $ols completely, the root element should stay (could happen with a rogue h1 element)
for (let i = 0; i < -levelDelta && $ols.length > 1; ++i) {
$ols.pop();
}
}