r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Improved URLs with urlencoding display

Browse Source
This commit is contained in:
Igor Zhukov 2016-12-12 14:15:20 +03:00
parent a6d2214b84
commit 3afe7e7fec
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/js/lib/ng_utils.js
View File

@ -1664,13 +1664,20 @@ angular.module('izhukov.utils', [])
skipEntity = true
break
}
var url = entity.url || entityText
url = wrapUrl(url, entity._ == 'messageEntityTextUrl' ? true : false)
var inner
if (entity._ == 'messageEntityTextUrl') {
url = entity.url
url = wrapUrl(url, true)
inner = wrapRichNestedText(entityText, entity.nested, options)
} else {
url = wrapUrl(entityText, false)
inner = encodeEntities(replaceUrlEncodings(entityText))
}
html.push(
'<a href="',
encodeEntities(url),
'" target="_blank" rel="noopener noreferrer">',
wrapRichNestedText(entityText, entity.nested, options),
inner,
'</a>'
)
break
@ -1867,6 +1874,16 @@ angular.module('izhukov.utils', [])
return url
}
function replaceUrlEncodings(urlWithEncoded) {
return urlWithEncoded.replace(/(%[A-Z\d]{2})+/g, function (str) {
try {
return decodeURIComponent(str);
} catch (e) {
return str
}
})
}
function wrapPlainText (text, options) {
if (emojiSupported) {
return text