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

Fixes #887 Enclose embedded images in URLs

Browse Source
This commit is contained in:
JC Brand 2017-06-16 15:09:40 +02:00
parent 796edb03fe
commit fb69106352
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -24,6 +24,7 @@
- #754 Show unread messages next to roster contacts. [jcbrand] - #754 Show unread messages next to roster contacts. [jcbrand]
- #864 Remove all inline CSS to comply with strict Content-Security-Policy headers [mathiasertl] - #864 Remove all inline CSS to comply with strict Content-Security-Policy headers [mathiasertl]
- #873 Inconsistent unread messages count updating [novokrest] - #873 Inconsistent unread messages count updating [novokrest]
- #887 Make embedded images clickabe [jcbrand]
- #890 Message carbons not sent out after reconnection [jcbrand] - #890 Message carbons not sent out after reconnection [jcbrand]
- #894 Room affiliation lost when connection jid and room presence jid are of different case [Rayzen] - #894 Room affiliation lost when connection jid and room presence jid are of different case [Rayzen]

9
spec/chatbox.js
View File

@ -1247,7 +1247,9 @@
}, 500).then(function () { }, 500).then(function () {
expect(view.sendMessage).toHaveBeenCalled(); expect(view.sendMessage).toHaveBeenCalled();
var msg = view.$el.find('.chat-content').find('.chat-message').last().find('.chat-msg-content'); var msg = view.$el.find('.chat-content').find('.chat-message').last().find('.chat-msg-content');
expect(msg.html()).toEqual('<img src="'+message+'" class="chat-image">'); expect(msg.html()).toEqual(
'<a target="_blank" rel="noopener" href="http://localhost:8000/logo/conversejs.svg"><img src="' +
message + '" class="chat-image"></a>');
message += "?param1=val1&param2=val2"; message += "?param1=val1&param2=val2";
test_utils.sendMessage(view, message); test_utils.sendMessage(view, message);
return test_utils.waitUntil(function () { return test_utils.waitUntil(function () {
@ -1256,7 +1258,10 @@
}).then(function () { }).then(function () {
expect(view.sendMessage).toHaveBeenCalled(); expect(view.sendMessage).toHaveBeenCalled();
var msg = view.$el.find('.chat-content').find('.chat-message').last().find('.chat-msg-content'); var msg = view.$el.find('.chat-content').find('.chat-message').last().find('.chat-msg-content');
expect(msg.html()).toEqual('<img src="'+message.replace(/&/g, '&amp;')+'" class="chat-image">'); expect(msg.html()).toEqual(
'<a target="_blank" rel="noopener" href="http://localhost:8000/logo/conversejs.svg?param1=val1&amp;param2=val2"><img src="'+
message.replace(/&/g, '&amp;') +
'" class="chat-image"></a>')
done(); done();
}); });
})); }));

15
src/utils.js
View File

@ -94,14 +94,15 @@
return false; return false;
}; };
$.fn.throttledHTML = _.throttle($.fn.html, 500); var throttledHTML = _.throttle(function (el, html) {
el.innerHTML = html;
}, 500);
$.fn.addHyperlinks = function () { $.fn.addHyperlinks = function () {
if (this.length > 0) { if (this.length > 0) {
this.each(function (i, obj) { this.each(function (i, obj) {
var prot, escaped_url; var prot, escaped_url;
var $obj = $(obj); var x = obj.innerHTML;
var x = $obj.html();
var list = x.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 );
if (list) { if (list) {
for (i=0; i<list.length; i++) { for (i=0; i<list.length; i++) {
@ -110,15 +111,11 @@
x = x.replace(list[i], '<a target="_blank" rel="noopener" href="' + prot + escaped_url + '">'+ list[i] + '</a>' ); x = x.replace(list[i], '<a target="_blank" rel="noopener" href="' + prot + escaped_url + '">'+ list[i] + '</a>' );
} }
} }
$obj.html(x); obj.innerHTML = x;
_.forEach(list, function (url) { _.forEach(list, function (url) {
isImage(unescapeHTML(url)).then(function (img) { isImage(unescapeHTML(url)).then(function (img) {
var prot = url.indexOf('http://') === 0 || url.indexOf('https://') === 0 ? '' : 'http://';
var escaped_url = encodeURI(decodeURI(url)).replace(/[!'()]/g, escape).replace(/\*/g, "%2A");
var new_url = '<a target="_blank" rel="noopener" href="' + prot + escaped_url + '">'+ url + '</a>';
img.className = 'chat-image'; img.className = 'chat-image';
x = x.replace(new_url, img.outerHTML); throttledHTML(obj.querySelector('a'), img.outerHTML);
$obj.throttledHTML(x);
}); });
}); });
}); });