kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix Markdown XHTML context param

This commit is contained in:
Douwe Maan 2015-10-22 11:00:34 +02:00
parent abbca6151d
commit f65840bc84
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/gitlab/markdown.rb
View File

@ -20,8 +20,6 @@ module Gitlab
# #
# Returns an HTML-safe String # Returns an HTML-safe String
def self.render(text, context = {}) def self.render(text, context = {})
context[:pipeline] ||= :full
cache_key = context.delete(:cache_key) cache_key = context.delete(:cache_key)
cache_key = full_cache_key(cache_key, context[:pipeline]) cache_key = full_cache_key(cache_key, context[:pipeline])
@ -35,8 +33,7 @@ module Gitlab
end end
def self.render_result(text, context = {}) def self.render_result(text, context = {})
pipeline_type = context[:pipeline] ||= :full pipeline_by_name(context[:pipeline]).call(text, context)
pipeline_by_type(pipeline_type).call(text, context)
end end
# Perform post-processing on an HTML String # Perform post-processing on an HTML String
@ -53,7 +50,10 @@ module Gitlab
# #
# Returns an HTML-safe String # Returns an HTML-safe String
def self.post_process(html, context) def self.post_process(html, context)
pipeline = pipeline_by_type(:post_process) pipeline = pipeline_by_name(context[:pipeline])
context = pipeline.transform_context(context)
pipeline = pipeline_by_name(:post_process)
if context[:xhtml] if context[:xhtml]
pipeline.to_document(html, context).to_html(save_with: Nokogiri::XML::Node::SaveOptions::AS_XHTML) pipeline.to_document(html, context).to_html(save_with: Nokogiri::XML::Node::SaveOptions::AS_XHTML)
@ -74,14 +74,15 @@ module Gitlab
end end
end end
def self.full_cache_key(cache_key, pipeline = :full) def self.full_cache_key(cache_key, pipeline_name)
return unless cache_key return unless cache_key
pipeline_name ||= :full
["markdown", *cache_key, pipeline] ["markdown", *cache_key, pipeline]
end end
def self.pipeline_by_type(pipeline_type) def self.pipeline_by_name(pipeline_name)
const_get("#{pipeline_type.to_s.camelize}Pipeline") pipeline_name ||= :full
const_get("#{pipeline_name.to_s.camelize}Pipeline")
end end
# Provide autoload paths for filters to prevent a circular dependency error # Provide autoload paths for filters to prevent a circular dependency error