Skip to content

Commit 8b20eb8

Browse files
authored
Merge branch 'develop' into element-value-for-el-option
2 parents 00a76a4 + e0bead3 commit 8b20eb8

File tree

4 files changed

+10
-12
lines changed

4 files changed

+10
-12
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2016 - present cinwell.li
3+
Copyright (c) 2016 - present Docsify Contributors (https://github.com/docsifyjs/docsify/graphs/contributors)
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

packages/docsify-server-renderer/package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/docsify-server-renderer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"dependencies": {
1818
"debug": "^4.3.3",
19-
"docsify": "^4.12.1",
19+
"docsify": "^4.12.2",
2020
"dompurify": "^2.3.2",
2121
"node-fetch": "^2.6.6",
2222
"resolve-pathname": "^3.0.0"

src/core/render/emojify.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@ function replace(m, $1) {
1212

1313
export function emojify(text) {
1414
return text
15-
.replace(/:\+1:/g, ':thumbsup:')
16-
.replace(/:-1:/g, ':thumbsdown:')
1715
.replace(/<(pre|template|code)[^>]*?>[\s\S]+?<\/(pre|template|code)>/g, m =>
1816
m.replace(/:/g, '__colon__')
1917
)
20-
.replace(/:(\w+?):/gi, (inBrowser && window.emojify) || replace)
18+
.replace(/:([a-z0-9_\-\+]+?):/g, (inBrowser && window.emojify) || replace)
2119
.replace(/__colon__/g, ':');
2220
}

0 commit comments

Comments
 (0)