nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check if the hashtag is a link in function .hashtagify

Browse source
This commit is contained in:
Hincu Petru 2014-03-13 21:39:12 +00:00
parent a51c4f0ddc
commit 7c4d783d51
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/app/helpers/text_formatter.js
View file

@ -108,11 +108,16 @@ $(function() {
};
textFormatter.hashtagify = function hashtagify(text){
var utf8WordCharcters =/(\s|^|>)#([\u0080-\uFFFF|\w|-]+|<3)/g
var utf8WordCharcters =/(\s|^|>)#([\u0080-\uFFFF|\w|-]+|<3)/g;
var linkRegex = /<a[^>]*>(.*?)<\/a>/g;
if(text.match(linkRegex))
return text;
else
return text.replace(utf8WordCharcters, function(hashtag, preceeder, tagText) {
return preceeder + "<a href='/tags/" + tagText.toLowerCase() +
"' class='tag'>#" + tagText + "</a>"
})
});
};
textFormatter.mentionify = function mentionify(text, mentions) {

7
spec/javascripts/app/helpers/text_formatter_spec.js
View file

@ -238,6 +238,13 @@ describe("app.helpers.textFormatter", function(){
expect(formattedText).toContain("/tags/parties")
})
it("doesn't create tag if the text is a link", function(){
var link = $('<a/>', { href: 'http://me.co' }).html('#me')[0].outerHTML;
var result = this.formatter.hashtagify(link);
expect(result).toEqual(link);
})
})
})