Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3985 from tgxworld/add_event_trigger_for_server_side_markdown 

FEATURE: DiscourseEvent hook for server side markdown context.
This commit is contained in:
Régis Hanol 2016-01-29 16:36:06 +01:00
parent 7d5fdd0997 28ac5fb17c
commit cd65f07e08
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pretty_text.rb
View File

@ -218,8 +218,7 @@ module PrettyText
context.eval('opts["categoryHashtagLookup"] = function(c){return helpers.category_hashtag_lookup(c);}') context.eval('opts["categoryHashtagLookup"] = function(c){return helpers.category_hashtag_lookup(c);}')
context.eval('opts["lookupAvatar"] = function(p){return Discourse.Utilities.avatarImg({size: "tiny", avatarTemplate: helpers.avatar_template(p)});}') context.eval('opts["lookupAvatar"] = function(p){return Discourse.Utilities.avatarImg({size: "tiny", avatarTemplate: helpers.avatar_template(p)});}')
context.eval('opts["getTopicInfo"] = function(i){return helpers.get_topic_info(i)};') context.eval('opts["getTopicInfo"] = function(i){return helpers.get_topic_info(i)};')
# TODO: @tgxworld this broke the build DiscourseEvent.trigger(:markdown_context, context)
# DiscourseEvent.trigger(:markdown_context, context)
baked = context.eval('Discourse.Markdown.markdownConverter(opts).makeHtml(raw)') baked = context.eval('Discourse.Markdown.markdownConverter(opts).makeHtml(raw)')
end end

1
spec/components/post_creator_spec.rb
View File

@ -78,6 +78,7 @@ describe PostCreator do
DiscourseEvent.expects(:trigger).with(:after_validate_topic, anything, anything).once DiscourseEvent.expects(:trigger).with(:after_validate_topic, anything, anything).once
DiscourseEvent.expects(:trigger).with(:before_create_topic, anything, anything).once DiscourseEvent.expects(:trigger).with(:before_create_topic, anything, anything).once
DiscourseEvent.expects(:trigger).with(:after_trigger_post_process, anything).once DiscourseEvent.expects(:trigger).with(:after_trigger_post_process, anything).once
DiscourseEvent.expects(:trigger).with(:markdown_context, anything).at_least_once
creator.create creator.create
end end