twisterarmy/twister-html
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-html.git synced 2025-01-27 23:24:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #269 from slr/tasty-markdown

Browse Source 
a bit more tasty ~markdown
This commit is contained in:
miguelfreitas 2015-07-15 18:13:00 -03:00
commit de30980d8b
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -38,5 +38,5 @@ Julian Steinwachs
UI navigation overhaul with proper browser's back button support UI navigation overhaul with proper browser's back button support
Сёма Мрачный Сёма Мрачный
Desktop notifications, language filtering, multiple fixes. Desktop notifications, language filtering, ~markdown, ton of fixes.

11
js/twister_formatpost.js
View File

@ -268,12 +268,12 @@ function htmlFormatMsg(msg, mentions) {
l = -1; l = -1;
break; break;
} else if (stopCharsMarkDown.indexOf(str[t]) === -1) { } else if (stopCharsMarkDown.indexOf(str[t]) === -1) {
l = whiteSpacesMarkDown.indexOf(str[t]); l = whiteSpaces.indexOf(str[t]);
break; break;
} }
} }
} else } else
l = whiteSpacesMarkDown.indexOf(str[i - 1]); l = whiteSpaces.indexOf(str[i - 1]);
if (stopCharsMarkDown.indexOf(str[j]) > -1) { if (stopCharsMarkDown.indexOf(str[j]) > -1) {
r = 1; r = 1;
for (t = j + 1; t < str.length; t++) { for (t = j + 1; t < str.length; t++) {
@ -281,12 +281,12 @@ function htmlFormatMsg(msg, mentions) {
r = -1; r = -1;
break; break;
} else if (stopCharsMarkDown.indexOf(str[t]) === -1) { } else if (stopCharsMarkDown.indexOf(str[t]) === -1) {
r = whiteSpacesMarkDown.indexOf(str[t]); r = whiteSpaces.indexOf(str[t]);
break; break;
} }
} }
} else } else
r = whiteSpacesMarkDown.indexOf(str[j]); r = whiteSpaces.indexOf(str[j]);
if (l > -1) { if (l > -1) {
if (r > -1) { if (r > -1) {
if (j - i > 2) { if (j - i > 2) {
@ -432,8 +432,7 @@ function htmlFormatMsg(msg, mentions) {
var stopCharsRight = '>' + whiteSpaces; var stopCharsRight = '>' + whiteSpaces;
var stopCharsRightHashtags = '>/\\.,:;?!%\'"[](){}^|«»…\u201C\u201D\u2026\u2014\u4E00\u3002\uFF0C\uFF1A\uFF1F\uFF01\u3010\u3011' // same as stopCharsTrailing but without '*~_-`' plus '>' var stopCharsRightHashtags = '>/\\.,:;?!%\'"[](){}^|«»…\u201C\u201D\u2026\u2014\u4E00\u3002\uFF0C\uFF1A\uFF1F\uFF01\u3010\u3011' // same as stopCharsTrailing but without '*~_-`' plus '>'
+ whiteSpaces; + whiteSpaces;
var whiteSpacesMarkDown = whiteSpaces + '+=&/\\.,:;?!%\'"[](){}^|«»…\u201C\u201D\u2026\u2014\u4E00\u3002\uFF0C\uFF1A\uFF1F\uFF01\u3010\u3011'; var stopCharsMarkDown = '/\\*~_-`.,:;?!%+=&\'"[](){}^|«»…\u201C\u201D\u2026\u2014\u4E00\u3002\uFF0C\uFF1A\uFF1F\uFF01\u3010\u3011';
var stopCharsMarkDown = '*~_-`';
var i, j, k, str, strEncoded; var i, j, k, str, strEncoded;
var html = []; var html = [];