Skip to content

Commit

Permalink
Merge branch 'develop' into edit
Browse files Browse the repository at this point in the history
  • Loading branch information
sy-records committed Apr 17, 2021
2 parents a5c2413 + c24f7f6 commit fc5c451
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 52 deletions.
2 changes: 2 additions & 0 deletions docs/plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,8 @@ Pagination for docsify. By [@imyelo](https://github.com/imyelo)
<script src="//cdn.jsdelivr.net/npm/docsify-pagination/dist/docsify-pagination.min.js"></script>
```

Click [here](https://github.com/imyelo/docsify-pagination#readme) to get more information.

## Tabs

A docsify.js plugin for displaying tabbed content from markdown.
Expand Down
88 changes: 44 additions & 44 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"*.js": "eslint --fix"
},
"dependencies": {
"dompurify": "^2.2.6",
"dompurify": "^2.2.7",
"marked": "^1.2.9",
"medium-zoom": "^1.0.6",
"opencollective-postinstall": "^2.0.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/docsify-server-renderer/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/docsify-server-renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"dependencies": {
"debug": "^4.3.2",
"docsify": "^4.12.1",
"dompurify": "^2.2.6",
"dompurify": "^2.2.7",
"node-fetch": "^2.6.0",
"resolve-pathname": "^3.0.0"
}
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/search/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export function search(query) {
keywords.forEach(keyword => {
// From https://github.com/sindresorhus/escape-string-regexp
const regEx = new RegExp(
ignoreDiacriticalMarks(keyword).replace(
escapeHtml(ignoreDiacriticalMarks(keyword)).replace(
/[|\\{}()[\]^$+*?.]/g,
'\\$&'
),
Expand All @@ -187,10 +187,10 @@ export function search(query) {
let indexTitle = -1;
let indexContent = -1;
handlePostTitle = postTitle
? ignoreDiacriticalMarks(postTitle)
? escapeHtml(ignoreDiacriticalMarks(postTitle))
: postTitle;
handlePostContent = postContent
? ignoreDiacriticalMarks(postContent)
? escapeHtml(ignoreDiacriticalMarks(postContent))
: postContent;

indexTitle = postTitle ? handlePostTitle.search(regEx) : -1;
Expand Down

0 comments on commit fc5c451

Please sign in to comment.