Revert "Le Funny Emoji Meme Face x--DD"

This reverts commit 5118ba9761.
This commit is contained in:
nilsding 2015-01-08 22:34:50 +01:00
parent 5118ba9761
commit d97763eda0
8 changed files with 4 additions and 28 deletions

1
.gitignore vendored
View File

@ -19,7 +19,6 @@ coverage/
/public/assets
/public/system
/public/images/emoji
# damn vim backup files
*~

View File

@ -34,10 +34,6 @@ gem 'rails-assets-growl'
gem "paperclip", "~> 4.2"
gem 'delayed_paperclip'
# x--DD
gem 'gemoji'
gem 'rumoji'
gem 'ruby-progressbar'
gem 'rails_admin'

View File

@ -118,7 +118,6 @@ GEM
foreman (0.76.0)
dotenv (~> 1.0.2)
thor (~> 0.19.1)
gemoji (2.1.0)
haml (4.0.6)
tilt
hashie (3.3.2)
@ -255,7 +254,6 @@ GEM
rspec-support (~> 3.0.0)
rspec-support (3.0.4)
ruby-progressbar (1.7.0)
rumoji (0.4.0)
safe_yaml (1.0.4)
sanitize (3.1.0)
crass (~> 1.0.1)
@ -364,7 +362,6 @@ DEPENDENCIES
font-awesome-rails (~> 4.2.0.0)
font-kit-rails
foreman
gemoji
haml
http_accept_language
jbuilder (~> 2.2.4)
@ -385,7 +382,6 @@ DEPENDENCIES
redis
rspec-rails (~> 3.0.0)
ruby-progressbar
rumoji
sanitize
sass-rails (~> 4.0.3)
sdoc (~> 0.4.1)

View File

@ -2,7 +2,6 @@
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
require File.expand_path('../config/application', __FILE__)
load 'tasks/emoji.rake'
Rails.application.load_tasks

View File

@ -1,12 +0,0 @@
module EmojiHelper
def emojify(content, size = 20)
Rumoji::encode(h(content).to_str).gsub(/:([\w+-]+):/) do |match|
if emoji = Emoji.find_by_alias($1)
%(<img alt="#$1" src="/images/emoji/#{emoji.image_filename}" style="vertical-align:middle" width="#{size}" height="#{size}" />)
else
match
end
end.html_safe if content.present?
end
end

View File

@ -1,7 +1,5 @@
module MarkdownHelper
include EmojiHelper
def markdown(content)
md = Redcarpet::Markdown.new(FlavoredMarkdown,
filter_html: true,
@ -18,6 +16,6 @@ module MarkdownHelper
disable_indented_code_blocks: true,
strikethrough: true,
superscript: false)
emojify Sanitize.fragment(md.render(content), EVIL_TAGS).html_safe
Sanitize.fragment(md.render(content), EVIL_TAGS).html_safe
end
end

View File

@ -15,7 +15,7 @@
·
%a{href: show_user_question_path(i.question.user.screen_name, i.question.id)}
#{i.question.answer_count} response(s)
%p.answerbox--question-text= emojify i.question.content, 16
%p.answerbox--question-text= i.question.content
.panel-body
%textarea.form-control{name: 'ib-answer', placeholder: 'Write your answer here...', data: { id: i.id }}
%br/

View File

@ -21,7 +21,7 @@
%a{href: show_user_question_path(a.question.user.screen_name, a.question.id)}
#{a.question.answer_count} answers
%p.answerbox--question-text
= emojify a.question.content, 16
= a.question.content
.panel-body
- if @display_all.nil?
= markdown a.content[0..255]