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

Fixed encodeEntities

Browse Source 
Also fixed nested emojis in links
Closes #702
This commit is contained in:
Igor Zhukov 2015-10-23 01:59:31 +02:00
parent eef98d0cd9
commit fd994fdd97
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1425,6 +1425,7 @@ angular.module('izhukov.utils', [])
if (nested === undefined) { if (nested === undefined) {
return encodeEntities(text); return encodeEntities(text);
} }
options.hasNested = true;
return wrapRichText(text, {entities: nested, nested: true}); return wrapRichText(text, {entities: nested, nested: true});
} }
@ -1642,7 +1643,7 @@ angular.module('izhukov.utils', [])
text = $sanitize(html.join('')); text = $sanitize(html.join(''));
if (emojiFound && !options.nested) { if (!options.nested && (emojiFound || options.hasNested)) {
text = text.replace(/\ufe0f|️|�|‍/g, '', text); text = text.replace(/\ufe0f|️|�|‍/g, '', text);
text = text.replace(/<span class="emoji emoji-(\d)-(\d+)-(\d+)"(.+?)<\/span>/g, text = text.replace(/<span class="emoji emoji-(\d)-(\d+)-(\d+)"(.+?)<\/span>/g,
'<span class="emoji emoji-spritesheet-$1" style="background-position: -$2px -$3px;" $4</span>'); '<span class="emoji emoji-spritesheet-$1" style="background-position: -$2px -$3px;" $4</span>');

5
app/js/lib/utils.js
View File

@ -361,6 +361,11 @@ function templateUrl (tplName) {
function encodeEntities(value) { function encodeEntities(value) {
return value. return value.
replace(/&/g, '&amp;'). replace(/&/g, '&amp;').
replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, function (value) {
var hi = value.charCodeAt(0);
var low = value.charCodeAt(1);
return '&#' + (((hi - 0xD800) * 0x400) + (low - 0xDC00) + 0x10000) + ';';
}).
replace(/([^\#-~| |!])/g, function (value) { // non-alphanumeric replace(/([^\#-~| |!])/g, function (value) { // non-alphanumeric
return '&#' + value.charCodeAt(0) + ';'; return '&#' + value.charCodeAt(0) + ';';
}). }).