jeena/Bungloo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

fixed #39 and #51

Browse source
This commit is contained in:
Jeena Paradies 2012-11-14 00:04:37 +01:00
parent 46bcb4c06b
commit af1eb210b0
1 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

33
WebKit/scripts/helper/Core.js
View file

@ -179,9 +179,13 @@ function(jQuery, Paths, URI, HostApp, Followings) {
template.in_reply.parentNode.className = "hidden"; template.in_reply.parentNode.className = "hidden";
var text = status.content.text.replace(/\n/g, "<br>"); var text = status.content.text.replace(/\n/g, "<br>");
var entities = [status.entity];
status.mentions.map(function (mention) {
entities.push(mention.entity)
});
template.message.innerHTML = this.replaceUsernamesWithLinks( template.message.innerHTML = this.replaceUsernamesWithLinks(
this.replaceURLWithHTMLLinks(text, status.entities, template.message) this.replaceURLWithHTMLLinks(text, entities, template.message)
); );
this.findMentions(template.message, status.mentions); this.findMentions(template.message, status.mentions);
@ -380,17 +384,30 @@ function(jQuery, Paths, URI, HostApp, Followings) {
Core.prototype.replaceURLWithHTMLLinks = function(text, entities, message_node) { Core.prototype.replaceURLWithHTMLLinks = function(text, entities, message_node) {
var exp = /(([^\^]https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_()|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig; var callback = function(url) {
return text.replace(exp, "<a href='$1'>$1</a>");
var result;
if (entities && entities.some(function(x) { return x == url })) {
result = url;
} else {
var protocol = "";
if (!url.startsWith("http://") && !url.startsWith("https://")) {
protocol = "http://";
}
result = '<a title="' + protocol + url + '"" href="' + protocol + url + '">' + url + '</a>';
}
return result;
}
return URI.withinString(text, callback);
} }
Core.prototype.replaceUsernamesWithLinks = function(text, mentions) { Core.prototype.replaceUsernamesWithLinks = function(text, mentions) {
return text; // FIXME!
var username = /(^|\s)(\^)(\w+)/ig;
var hash = /(^|\s)(#)(\w+)/ig; var hash = /(^|\s)(#)(\w+)/ig;
text = text.replace(username, "$1$2<a href='tentia://profile/$3'>$3</a>"); return text.replace(hash, "$1$2<a href='https://skate.io/search?q=%23$3'>$3</a>");
return text.replace(hash, "$1$2<a href='http://search.twitter.com/search?q=%23$3'>$3</a>");
} }
Core.prototype.replyTo = function(entity, status_id, mentions) { Core.prototype.replyTo = function(entity, status_id, mentions) {