codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-30 10:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

UX: we should always simply use emoji codes as opposed to treating as image

Browse source
This commit is contained in:
Sam 2016-06-02 12:29:25 +10:00
parent 04bea0c9d6
commit e01dc54f2a
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/excerpt_parser.rb
View file

@ -14,7 +14,6 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
@markdown_images = options[:markdown_images] == true @markdown_images = options[:markdown_images] == true
@keep_newlines = options[:keep_newlines] == true @keep_newlines = options[:keep_newlines] == true
@keep_emoji_images = options[:keep_emoji_images] == true @keep_emoji_images = options[:keep_emoji_images] == true
@keep_emoji_codes = options[:keep_emoji_codes] == true
@start_excerpt = false @start_excerpt = false
end end
@ -54,7 +53,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
if attributes["class"] == 'emoji' if attributes["class"] == 'emoji'
if @keep_emoji_images if @keep_emoji_images
return include_tag(name, attributes) return include_tag(name, attributes)
elsif @keep_emoji_codes else
return characters(attributes["alt"]) return characters(attributes["alt"])
end end
end end

2
lib/onebox/engine/discourse_local_onebox.rb
View file

@ -66,7 +66,7 @@ module Onebox
topic = post.topic topic = post.topic
slug = Slug.for(topic.title) slug = Slug.for(topic.title)
excerpt = post.excerpt(SiteSetting.post_onebox_maxlength, { keep_emoji_codes: true }) excerpt = post.excerpt(SiteSetting.post_onebox_maxlength)
excerpt.gsub!("\n"," ") excerpt.gsub!("\n"," ")
# hack to make it render for now # hack to make it render for now
excerpt.gsub!("[/quote]", "[quote]") excerpt.gsub!("[/quote]", "[quote]")

2
spec/components/pretty_text_spec.rb
View file

@ -263,7 +263,7 @@ HTML
it "should have an option to preserve emoji codes" do it "should have an option to preserve emoji codes" do
emoji_code = "<img src='/images/emoji/emoji_one/heart.png?v=1' title=':heart:' class='emoji' alt=':heart:'>" emoji_code = "<img src='/images/emoji/emoji_one/heart.png?v=1' title=':heart:' class='emoji' alt=':heart:'>"
expect(PrettyText.excerpt(emoji_code, 100, { keep_emoji_codes: true })).to eq(":heart:") expect(PrettyText.excerpt(emoji_code, 100)).to eq(":heart:")
end end
end end