<3z
This commit is contained in:
parent
06a992a088
commit
f41bc0c14d
2 changed files with 16 additions and 0 deletions
|
|
@ -170,6 +170,7 @@ module ApplicationHelper
|
||||||
message = process_vimeo(message, options[:vimeo_maps])
|
message = process_vimeo(message, options[:vimeo_maps])
|
||||||
message = process_autolinks(message)
|
message = process_autolinks(message)
|
||||||
message = process_emphasis(message)
|
message = process_emphasis(message)
|
||||||
|
message.gsub!(/<3/, "♥")
|
||||||
|
|
||||||
if options[:newlines]
|
if options[:newlines]
|
||||||
message.gsub!(/\n+/, '<br />')
|
message.gsub!(/\n+/, '<br />')
|
||||||
|
|
@ -178,6 +179,7 @@ module ApplicationHelper
|
||||||
return message
|
return message
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
def process_links(message)
|
def process_links(message)
|
||||||
message.gsub!(/\[([^\[]+)\]\(([^ ]+) \"(([^&]|(&[^q])|(&q[^u])|(&qu[^o])|(&quo[^t])|("[^;]))+)\"\)/) do |m|
|
message.gsub!(/\[([^\[]+)\]\(([^ ]+) \"(([^&]|(&[^q])|(&q[^u])|(&qu[^o])|(&quo[^t])|("[^;]))+)\"\)/) do |m|
|
||||||
escape = "\\"
|
escape = "\\"
|
||||||
|
|
@ -266,6 +268,11 @@ module ApplicationHelper
|
||||||
return processed_message
|
return processed_message
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def process_hearts(message)
|
||||||
|
Rails.logger.info message
|
||||||
|
message
|
||||||
|
end
|
||||||
|
|
||||||
def info_text(text)
|
def info_text(text)
|
||||||
image_tag 'icons/monotone_question.png', :class => 'what_is_this', :title => text
|
image_tag 'icons/monotone_question.png', :class => 'what_is_this', :title => text
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -80,6 +80,8 @@ describe ApplicationHelper do
|
||||||
markdownify(proto+"://"+url).should == "<a target=\"_blank\" href=\""+proto+"://"+url+"\">"+url+"</a>"
|
markdownify(proto+"://"+url).should == "<a target=\"_blank\" href=\""+proto+"://"+url+"\">"+url+"</a>"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
describe "video links" do
|
describe "video links" do
|
||||||
it "recognizes vimeo links" do
|
it "recognizes vimeo links" do
|
||||||
video_id = "17449557"
|
video_id = "17449557"
|
||||||
|
|
@ -147,6 +149,13 @@ describe ApplicationHelper do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "hearts" do
|
||||||
|
it "replaces <3 with ♥" do
|
||||||
|
message = "i <3 you"
|
||||||
|
markdownify(message).should == "i ♥ you"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe "weak emphasis" do
|
describe "weak emphasis" do
|
||||||
it "should be recognized (1/2)" do
|
it "should be recognized (1/2)" do
|
||||||
message = "*some text* some text *some text* some text"
|
message = "*some text* some text *some text* some text"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue