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

Revert "Merge pull request #4847 from hincupetru/3692-hashtags-inside-markdown-link"

Browse source 
This reverts commit 06ab498620, reversing
changes made to 3c4d8d95d3.

Conflicts:
	Changelog.md
This commit is contained in:
Jonne Haß 2014-03-15 21:08:54 +01:00
parent f2fedea3db
commit cfca0e88f1
3 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -24,7 +24,6 @@
* Fixed Atom Feed Error if reshared Post is deleted [#4638] (https://github.com/diaspora/diaspora/issues/4638) * Fixed Atom Feed Error if reshared Post is deleted [#4638] (https://github.com/diaspora/diaspora/issues/4638)
* Show hovercards in the notification drop-down for users on the same pod [#4843](https://github.com/diaspora/diaspora/pull/4843) * Show hovercards in the notification drop-down for users on the same pod [#4843](https://github.com/diaspora/diaspora/pull/4843)
* The photo stream no longer repeats after the last photo [#4726](https://github.com/diaspora/diaspora/issues/4726) * The photo stream no longer repeats after the last photo [#4726](https://github.com/diaspora/diaspora/issues/4726)
* Stop parsing hashtags inside markdown links [#3692](https://github.com/diaspora/diaspora/issues/3692)
* Fix hovercards in the notificaitons dropdown [#4693](https://github.com/diaspora/diaspora/issues/4693) * Fix hovercards in the notificaitons dropdown [#4693](https://github.com/diaspora/diaspora/issues/4693)
## Features ## Features

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

@ -108,16 +108,11 @@ $(function() {
}; };
textFormatter.hashtagify = function hashtagify(text){ 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; return text.replace(utf8WordCharcters, function(hashtag, preceeder, tagText) {
return preceeder + "<a href='/tags/" + tagText.toLowerCase() +
if(text.match(linkRegex)) "' class='tag'>#" + tagText + "</a>"
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) { textFormatter.mentionify = function mentionify(text, mentions) {

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

@ -238,13 +238,6 @@ describe("app.helpers.textFormatter", function(){
expect(formattedText).toContain("/tags/parties") 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);
})
}) })
}) })