Default to template name

This commit is contained in:
Mike Angell
2019-10-08 06:37:16 +11:00
parent e6a6d2e813
commit efaec29fa6
3 changed files with 13 additions and 23 deletions

View File

@@ -29,7 +29,7 @@ module Liquid
template_name = Regexp.last_match(1)
variable_name = Regexp.last_match(3)
@alias_name = Regexp.last_match(5) || nil
@alias_name = Regexp.last_match(5)
@variable_name_expr = variable_name ? Expression.parse(variable_name) : nil
@template_name_expr = Expression.parse(template_name)
@attributes = {}
@@ -56,7 +56,7 @@ module Liquid
parse_context: parse_context
)
context_variable_name = @alias_name ? @alias_name : template_name.split('/').last
context_variable_name = @alias_name || template_name.split('/').last
variable = if @variable_name_expr
context.evaluate(@variable_name_expr)

View File

@@ -16,7 +16,7 @@ module Liquid
template_name = Regexp.last_match(1)
variable_name = Regexp.last_match(3)
@alias_name = Regexp.last_match(5) || nil
@alias_name = Regexp.last_match(5)
@variable_name_expr = variable_name ? Expression.parse(variable_name) : nil
@template_name_expr = Expression.parse(template_name)
@@ -41,7 +41,7 @@ module Liquid
parse_context: parse_context
)
context_variable_name = @alias_name ? @alias_name : "this"
context_variable_name = @alias_name || template_name.split('/').last
variable = if @variable_name_expr
context.evaluate(@variable_name_expr)
@@ -57,7 +57,7 @@ module Liquid
@attributes.each do |key, value|
inner_context[key] = context.evaluate(value)
end
inner_context[context_variable_name] = var
inner_context[context_variable_name] = var if @variable_name_expr
partial.render_to_output_buffer(inner_context, output)
end