git.iko.soy/webring
on master help sign in
add in better tag regex to not interfere with links that have hashtags in them
c796addckipp01
scripts/hallway.js+2−2
compare with master
unifiedsplit
@@ -2,7 +2,7 @@
2
2
3const reChannel = /(\s|^)\/([a-zA-Z0-9]+)/g
3const reChannel = /(\s|^)\/([a-zA-Z0-9]+)/g
4const reUser = /((\s|^)@<[a-zA-Z0-9./:\-_+~#= ]*>)/g
4const reUser = /((\s|^)@<[a-zA-Z0-9./:\-_+~#= ]*>)/g
5−const reTag = /([^&]|^)#([a-zA-Z0-9]+)/g
5+const reTag = /(^|\s)(#[a-z\d-]+)/ig
6const reUrl = /((https?):\/\/(([-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b)([-a-zA-Z0-9@:%_+.~#?&//=]*)))/g
6const reUrl = /((https?):\/\/(([-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b)([-a-zA-Z0-9@:%_+.~#?&//=]*)))/g
7
7
8function Hallway (sites) {
8function Hallway (sites) {
@@ -117,7 +117,7 @@ function Hallway (sites) {
117 entry.html = entry.body
117 entry.html = entry.body
118 .replace(reChannel, `$1<span class='channel'>/$2</span>`)
118 .replace(reChannel, `$1<span class='channel'>/$2</span>`)
119 .replace(reUser, this.findMention)
119 .replace(reUser, this.findMention)
120− .replace(reTag, `$1<span class='tag'>#$2</span>`)
120+ .replace(reTag, '$1<span class="tag">$2</span>')
121 .replace(reUrl, `<a target="_blank" href='$1'>$1</a>`)
121 .replace(reUrl, `<a target="_blank" href='$1'>$1</a>`)
122
122
123 const filter = window.location.hash.substr(1).replace(/\+/g, ' ').toLowerCase()
123 const filter = window.location.hash.substr(1).replace(/\+/g, ' ').toLowerCase()