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

Fixed simple markdown parser

Browse Source 
Closes #1009
This commit is contained in:
Igor Zhukov 2015-12-21 16:15:36 +00:00
parent 27dcf761ab
commit cf7488ddd6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1178,7 +1178,7 @@ 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\.,:?!;]|$)|(^|\s)`([^\n]+?)`([\s\.,:?!;]|$)/; var markdownRegExp = /(^|\s)(````?)([\s\S]+?)(````?)([\s\n\.,:?!;]|$)|(^|\s)`([^\n]+?)`([\s\.,:?!;]|$)/;
var siteHashtags = { var siteHashtags = {
Telegram: '#/im?q=%23{1}', Telegram: '#/im?q=%23{1}',
@ -1340,11 +1340,19 @@ 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]).replace(/^\s+|\s+$/g, ''); var text = (match[3] || match[7]);
rawOffset -= text.length;
text = text.replace(/^\s+|\s+$/g, '');
rawOffset += text.length;
if (text.match(/^`*$/)) { if (text.match(/^`*$/)) {
newText.push(match[0]); newText.push(match[0]);
} }
else if (match[3]) { // pre else if (match[3]) { // pre
if (match[5] == "\n") {
match[5] = '';
rawOffset -= 1;
}
newText.push(match[1] + text + match[5]); newText.push(match[1] + text + match[5]);
entities.push({ entities.push({
_: 'messageEntityPre', _: 'messageEntityPre',