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

Merge branch 'pr/1267'

Browse Source
This commit is contained in:
Igor Zhukov 2016-11-19 18:15:46 +03:00
commit fc3f3d2063
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/js/lib/ng_utils.js Normal file → Executable file
View File

@ -1238,7 +1238,8 @@ angular.module('izhukov.utils', [])
var soundcloudRegExp = /^https?:\/\/(?:soundcloud\.com|snd\.sc)\/([a-zA-Z0-9%\-\_]+)\/([a-zA-Z0-9%\-\_]+)/i var soundcloudRegExp = /^https?:\/\/(?:soundcloud\.com|snd\.sc)\/([a-zA-Z0-9%\-\_]+)\/([a-zA-Z0-9%\-\_]+)/i
var spotifyRegExp = /(https?:\/\/(open\.spotify\.com|play\.spotify\.com|spoti\.fi)\/(.+)|spotify:(.+))/i var spotifyRegExp = /(https?:\/\/(open\.spotify\.com|play\.spotify\.com|spoti\.fi)\/(.+)|spotify:(.+))/i
var markdownRegExp = /(^|\s)(````?)([\s\S]+?)(````?)([\s\n\.,:?!;]|$)|(^|\s)`([^\n]+?)`([\s\.,:?!;]|$)|@(\d+)\s*\((.+?)\)/ var markdownTestRegExp = /[`_*@]/;
var markdownRegExp = /(^|\s)(````?)([\s\S]+?)(````?)([\s\n\.,:?!;]|$)|(^|\s)([`*_])([^\n]+?)\7([\s\.,:?!;]|$)|@(\d+)\s*\((.+?)\)/
var siteHashtags = { var siteHashtags = {
Telegram: 'tg://search_hashtag?hashtag={1}', Telegram: 'tg://search_hashtag?hashtag={1}',
@ -1254,6 +1255,12 @@ angular.module('izhukov.utils', [])
GitHub: 'https://github.com/{1}' GitHub: 'https://github.com/{1}'
} }
var markdownEntities = {
'`': 'messageEntityCode',
'*': 'messageEntityBold',
'_': 'messageEntityItalic'
}
return { return {
wrapRichText: wrapRichText, wrapRichText: wrapRichText,
wrapPlainText: wrapPlainText, wrapPlainText: wrapPlainText,
@ -1402,7 +1409,7 @@ angular.module('izhukov.utils', [])
} }
function parseMarkdown (text, entities, noTrim) { function parseMarkdown (text, entities, noTrim) {
if (text.indexOf('`') == -1 && text.indexOf('@') == -1) {     if (!markdownTestRegExp.test(text)) {
return noTrim ? text : text.trim() return noTrim ? text : text.trim()
} }
var raw = text var raw = text
@ -1414,7 +1421,7 @@ angular.module('izhukov.utils', [])
matchIndex = rawOffset + match.index matchIndex = rawOffset + match.index
newText.push(raw.substr(0, match.index)) newText.push(raw.substr(0, match.index))
var text = (match[3] || match[7] || match[10]) var text = (match[3] || match[8] || match[11])
rawOffset -= text.length rawOffset -= text.length
text = text.replace(/^\s+|\s+$/g, '') text = text.replace(/^\s+|\s+$/g, '')
rawOffset += text.length rawOffset += text.length
@ -1435,19 +1442,19 @@ angular.module('izhukov.utils', [])
length: text.length length: text.length
}) })
rawOffset -= match[2].length + match[4].length rawOffset -= match[2].length + match[4].length
} else if (match[7]) { // code } else if (match[9]) { // code
newText.push(match[6] + text + match[8]) newText.push(match[6] + text + match[9])
entities.push({ entities.push({
_: 'messageEntityCode', _: markdownEntities[match[7]],
offset: matchIndex + match[6].length, offset: matchIndex + match[6].length,
length: text.length length: text.length
}) })
rawOffset -= 2 rawOffset -= 2
} else if (match[10]) { // custom mention } else if (match[11]) { // custom mention
newText.push(text) newText.push(text)
entities.push({ entities.push({
_: 'messageEntityMentionName', _: 'messageEntityMentionName',
user_id: match[9], user_id: match[10],
offset: matchIndex, offset: matchIndex,
length: text.length length: text.length
}) })
@ -1808,6 +1815,18 @@ angular.module('izhukov.utils', [])
) )
break break
case 'messageEntityBold':
code.push(
'*', entityText, '*'
)
break
case 'messageEntityItalic':
code.push(
'_', entityText, '_'
)
break
case 'messageEntityPre': case 'messageEntityPre':
code.push( code.push(
'```', entityText, '```' '```', entityText, '```'