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

Update markdown-it, disable fuzzy links

Browse source
This commit is contained in:
Steffen van Bergerem 2015-04-21 13:02:59 +02:00 committed by Jonne Haß
parent 2d3c0680ea
commit a14713b985
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -92,7 +92,7 @@ gem "js-routes", "1.0.0"
source "https://rails-assets.org" do source "https://rails-assets.org" do
gem "rails-assets-jquery", "1.11.1" # Should be kept in sync with jquery-rails gem "rails-assets-jquery", "1.11.1" # Should be kept in sync with jquery-rails
gem "rails-assets-markdown-it", "4.1.2" gem "rails-assets-markdown-it", "4.2.0"
gem "rails-assets-markdown-it-hashtag", "0.3.0" gem "rails-assets-markdown-it-hashtag", "0.3.0"
gem "rails-assets-markdown-it-diaspora-mention", "0.3.0" gem "rails-assets-markdown-it-diaspora-mention", "0.3.0"
gem "rails-assets-markdown-it-sanitizer", "0.3.0" gem "rails-assets-markdown-it-sanitizer", "0.3.0"

4
Gemfile.lock
View file

@ -507,7 +507,7 @@ GEM
rails-assets-jquery.slimscroll (1.3.3) rails-assets-jquery.slimscroll (1.3.3)
rails-assets-jquery (>= 1.7) rails-assets-jquery (>= 1.7)
rails-assets-markdown-it--markdown-it-for-inline (0.1.0) rails-assets-markdown-it--markdown-it-for-inline (0.1.0)
rails-assets-markdown-it (4.1.2) rails-assets-markdown-it (4.2.0)
rails-assets-markdown-it-diaspora-mention (0.3.0) rails-assets-markdown-it-diaspora-mention (0.3.0)
rails-assets-markdown-it-hashtag (0.3.0) rails-assets-markdown-it-hashtag (0.3.0)
rails-assets-markdown-it-sanitizer (0.3.0) rails-assets-markdown-it-sanitizer (0.3.0)
@ -773,7 +773,7 @@ DEPENDENCIES
rails-assets-jquery-idletimer (= 1.0.1)! rails-assets-jquery-idletimer (= 1.0.1)!
rails-assets-jquery-placeholder (= 2.1.1)! rails-assets-jquery-placeholder (= 2.1.1)!
rails-assets-jquery-textchange (= 0.2.3)! rails-assets-jquery-textchange (= 0.2.3)!
rails-assets-markdown-it (= 4.1.2)! rails-assets-markdown-it (= 4.2.0)!
rails-assets-markdown-it--markdown-it-for-inline (= 0.1.0)! rails-assets-markdown-it--markdown-it-for-inline (= 0.1.0)!
rails-assets-markdown-it-diaspora-mention (= 0.3.0)! rails-assets-markdown-it-diaspora-mention (= 0.3.0)!
rails-assets-markdown-it-hashtag (= 0.3.0)! rails-assets-markdown-it-hashtag (= 0.3.0)!

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

@ -52,6 +52,7 @@
// xmpp: should behave like mailto: // xmpp: should behave like mailto:
md.linkify.add('xmpp:','mailto:'); md.linkify.add('xmpp:','mailto:');
md.linkify.set({ fuzzyLink: false });
// Bootstrap table markup // Bootstrap table markup
md.renderer.rules.table_open = function () { return '<table class="table table-striped">\n'; }; md.renderer.rules.table_open = function () { return '<table class="table table-striped">\n'; };

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

@ -96,9 +96,8 @@ describe("app.helpers.textFormatter", function(){
"http://www.yahooligans.com", "http://www.yahooligans.com",
"http://obama.com", "http://obama.com",
"http://japan.co.jp", "http://japan.co.jp",
"www.mygreat-example-website.de", "http://www.mygreat-example-website.de",
"www.jenseitsderfenster.de", // from issue #3468 "http://www.jenseitsderfenster.de", // from issue #3468
"www.google.com",
"xmpp:podmin@pod.tld", "xmpp:podmin@pod.tld",
"mailto:podmin@pod.tld" "mailto:podmin@pod.tld"
]; ];
@ -119,7 +118,6 @@ describe("app.helpers.textFormatter", function(){
it("adds a missing http://", function() { it("adds a missing http://", function() {
expect(this.formatter('[test](www.google.com)')).toContain('href="http://www.google.com"'); expect(this.formatter('[test](www.google.com)')).toContain('href="http://www.google.com"');
expect(this.formatter('[test](http://www.google.com)')).toContain('href="http://www.google.com"'); expect(this.formatter('[test](http://www.google.com)')).toContain('href="http://www.google.com"');
expect(this.formatter('www.google.com')).toContain('href="http://www.google.com"');
}); });
it("respects code blocks", function() { it("respects code blocks", function() {