提交 c9fa3f03 编写于 作者: J José Valim

Also allow prefixes as third argument to lookup context.

上级 4758d370
...@@ -16,9 +16,7 @@ module ViewPaths ...@@ -16,9 +16,7 @@ module ViewPaths
# information. # information.
def lookup_context def lookup_context
@lookup_context ||= @lookup_context ||=
ActionView::LookupContext.new(self.class._view_paths, details_for_lookup).tap do |ctx| ActionView::LookupContext.new(self.class._view_paths, details_for_lookup, _prefixes)
ctx.prefixes = _prefixes
end
end end
def details_for_lookup def details_for_lookup
......
...@@ -60,11 +60,11 @@ def initialize ...@@ -60,11 +60,11 @@ def initialize
end end
end end
def initialize(view_paths, details = {}) def initialize(view_paths, details = {}, prefixes = [])
@details, @details_key = { :handlers => default_handlers }, nil @details, @details_key = { :handlers => default_handlers }, nil
@frozen_formats, @skip_default_locale = false, false @frozen_formats, @skip_default_locale = false, false
@cache = true @cache = true
@prefixes = [] @prefixes = prefixes
self.view_paths = view_paths self.view_paths = view_paths
self.registered_detail_setters.each do |key, setter| self.registered_detail_setters.each do |key, setter|
......
...@@ -20,7 +20,7 @@ def determine_template(options) #:nodoc: ...@@ -20,7 +20,7 @@ def determine_template(options) #:nodoc:
if options.key?(:text) if options.key?(:text)
Template::Text.new(options[:text], formats.try(:first)) Template::Text.new(options[:text], formats.try(:first))
elsif options.key?(:file) elsif options.key?(:file)
with_fallbacks { find_template(options[:file], options[:prefixes], false, keys) } with_fallbacks { find_template(options[:file], nil, false, keys) }
elsif options.key?(:inline) elsif options.key?(:inline)
handler = Template.handler_for_extension(options[:type] || "erb") handler = Template.handler_for_extension(options[:type] || "erb")
Template.new(options[:inline], "inline template", handler, :locals => keys) Template.new(options[:inline], "inline template", handler, :locals => keys)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册