Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

emoji: Fix rendering of emojione images

Browse Source
This commit is contained in:
JC Brand 2017-07-15 20:13:44 +02:00
parent 972c31be1d
commit 12510a9689
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/converse-chatview.js
View File

@ -427,10 +427,11 @@
'extra_classes': this.getExtraMessageClasses(attrs) 'extra_classes': this.getExtraMessageClasses(attrs)
}) })
)); ));
text = utils.addEmoji(_converse, emojione, text);
const msg_content = $msg[0].querySelector('.chat-msg-content'); const msg_content = $msg[0].querySelector('.chat-msg-content');
msg_content.innerHTML = xss.filterXSS(text, {'whiteList': {}}); msg_content.innerHTML = utils.addEmoji(
utils.addHyperlinks(msg_content); _converse, emojione, utils.addHyperlinks(xss.filterXSS(text, {'whiteList': {}}))
);
utils.renderImageURLs(msg_content);
return $msg; return $msg;
}, },

19
src/utils.js
View File

@ -97,10 +97,6 @@
return false; return false;
}; };
var throttledHTML = _.throttle(function (el, html) {
el.innerHTML = html;
}, 500);
function calculateSlideStep (height) { function calculateSlideStep (height) {
if (height > 100) { if (height > 100) {
return 10; return 10;
@ -157,21 +153,24 @@
} }
}; };
utils.addHyperlinks = function (obj) { utils.addHyperlinks = function (text) {
var x = obj.innerHTML; var list = text.match(/\b(https?:\/\/|www\.|https?:\/\/www\.)[^\s<>]{2,200}\b/g ) || [];
var list = x.match(/\b(https?:\/\/|www\.|https?:\/\/www\.)[^\s<]{2,200}\b/g ) || [];
_.each(list, (match) => { _.each(list, (match) => {
const prot = match.indexOf('http://') === 0 || match.indexOf('https://') === 0 ? '' : 'http://'; const prot = match.indexOf('http://') === 0 || match.indexOf('https://') === 0 ? '' : 'http://';
const url = prot + encodeURI(decodeURI(match)).replace(/[!'()]/g, escape).replace(/\*/g, "%2A"); const url = prot + encodeURI(decodeURI(match)).replace(/[!'()]/g, escape).replace(/\*/g, "%2A");
x = x.replace(match, '<a target="_blank" rel="noopener" href="' + url + '">'+ match + '</a>' ); text = text.replace(match, '<a target="_blank" rel="noopener" href="' + url + '">'+ match + '</a>' );
}); });
obj.innerHTML = x; return text;
};
utils.renderImageURLs = function (obj) {
var list = obj.textContent.match(/\b(https?:\/\/|www\.|https?:\/\/www\.)[^\s<>]{2,200}\b/g ) || [];
_.forEach(list, function (url) { _.forEach(list, function (url) {
isImage(unescapeHTML(url)).then(function (img) { isImage(unescapeHTML(url)).then(function (img) {
img.className = 'chat-image'; img.className = 'chat-image';
var a = obj.querySelector('a'); var a = obj.querySelector('a');
if (!_.isNull(a)) { if (!_.isNull(a)) {
throttledHTML(a, img.outerHTML); a.innerHTML = img.outerHTML;
} }
}); });
}); });