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

Add img-responsive to image class

Browse source
This commit is contained in:
Steffen van Bergerem 2015-06-11 11:33:28 +02:00
parent c83650f023
commit 18a8211cc3
4 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -98,7 +98,7 @@ source "https://rails-assets.org" do
gem "rails-assets-markdown-it", "4.2.2" gem "rails-assets-markdown-it", "4.2.2"
gem "rails-assets-markdown-it-hashtag", "0.3.1" gem "rails-assets-markdown-it-hashtag", "0.3.1"
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.1" gem "rails-assets-markdown-it-sanitizer", "0.3.2"
gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1" gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1"
gem "rails-assets-markdown-it-sub", "1.0.0" gem "rails-assets-markdown-it-sub", "1.0.0"
gem "rails-assets-markdown-it-sup", "1.0.0" gem "rails-assets-markdown-it-sup", "1.0.0"

4
Gemfile.lock
View file

@ -550,7 +550,7 @@ GEM
rails-assets-markdown-it (4.2.2) rails-assets-markdown-it (4.2.2)
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.1) rails-assets-markdown-it-hashtag (0.3.1)
rails-assets-markdown-it-sanitizer (0.3.1) rails-assets-markdown-it-sanitizer (0.3.2)
rails-assets-markdown-it-sub (1.0.0) rails-assets-markdown-it-sub (1.0.0)
rails-assets-markdown-it-sup (1.0.0) rails-assets-markdown-it-sup (1.0.0)
rails-assets-perfect-scrollbar (0.6.2) rails-assets-perfect-scrollbar (0.6.2)
@ -835,7 +835,7 @@ DEPENDENCIES
rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)! rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)!
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.1)! rails-assets-markdown-it-hashtag (= 0.3.1)!
rails-assets-markdown-it-sanitizer (= 0.3.1)! rails-assets-markdown-it-sanitizer (= 0.3.2)!
rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sub (= 1.0.0)!
rails-assets-markdown-it-sup (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)!
rails-assets-perfect-scrollbar (= 0.6.2)! rails-assets-perfect-scrollbar (= 0.6.2)!

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

@ -29,6 +29,10 @@
tokens[idx].attrPush([ "target", "_blank" ]); tokens[idx].attrPush([ "target", "_blank" ]);
}); });
md.use(inlinePlugin, "responsive_images", "image", function (tokens, idx) {
tokens[idx].attrPush([ "class", "img-responsive" ]);
});
var hashtagPlugin = window.markdownitHashtag; var hashtagPlugin = window.markdownitHashtag;
md.use(hashtagPlugin, { md.use(hashtagPlugin, {
// compare tag_text_regexp in app/models/acts_as_taggable_on-tag.rb // compare tag_text_regexp in app/models/acts_as_taggable_on-tag.rb
@ -49,7 +53,7 @@
var supPlugin = window.markdownitSup; var supPlugin = window.markdownitSup;
md.use(supPlugin); md.use(supPlugin);
var sanitizerPlugin = window.markdownitSanitizer; var sanitizerPlugin = window.markdownitSanitizer;
md.use(sanitizerPlugin); md.use(sanitizerPlugin, {imageClass: "img-responsive"});
var hljs = window.hljs; var hljs = window.hljs;
md.set({ md.set({
@ -76,7 +80,6 @@
// 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"; };
return md.render(text); return md.render(text);
}; };
})(); })();

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

@ -147,6 +147,16 @@ describe("app.helpers.textFormatter", function(){
expect(wrapper.find('code').text()).toEqual('<unknown tag>'); expect(wrapper.find('code').text()).toEqual('<unknown tag>');
}); });
it("adds 'img-responsive' to the image class", function() {
var content = "![alt](http://google.com)]";
var wrapper = $("<div>").html(this.formatter(content));
expect(wrapper.find("img")).toHaveClass("img-responsive");
content = "<img src=\"http://google.com\">";
wrapper = $("<div>").html(this.formatter(content));
expect(wrapper.find("img")).toHaveClass("img-responsive");
});
context("symbol conversion", function() { context("symbol conversion", function() {
beforeEach(function() { beforeEach(function() {
this.input_strings = [ this.input_strings = [