deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Here we go

Browse source
This commit is contained in:
Thomas Reynolds 2015-05-02 14:23:16 -07:00
parent 5591c3337b
commit 9454536b12
6 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
middleman-core/lib/middleman-core/core_extensions/data.rb
View file

@ -11,7 +11,7 @@ module Middleman
# Make the internal `data_store` method available as `app.data` # Make the internal `data_store` method available as `app.data`
expose_to_application data: :data_store expose_to_application data: :data_store
# Exposes `data` to templates # Exposes `data` to templates
expose_to_template data: :data_store expose_to_template data: :data_store

6
middleman-core/lib/middleman-core/extension.rb
View file

@ -198,7 +198,7 @@ module Middleman
end end
# Takes a method within this extension and exposes it inside the scope # Takes a method within this extension and exposes it inside the scope
# of the config.rb sandbox. # of the config.rb sandbox.
# @example with Hash: # @example with Hash:
# expose_to_config global_name: :local_name # expose_to_config global_name: :local_name
# @example with Array: # @example with Array:
@ -405,7 +405,7 @@ module Middleman
elsif g.is_a? Symbol elsif g.is_a? Symbol
definition = method(g) definition = method(g)
if definition.arity === 0 if definition.arity == 0
send(g) send(g)
else else
send(g, resources) send(g, resources)
@ -421,7 +421,7 @@ module Middleman
if g.is_a? Symbol if g.is_a? Symbol
definition = method(g) definition = method(g)
g = if definition.arity === 0 g = if definition.arity == 0
send(g) send(g)
else else
send(g, resources) send(g, resources)

3
middleman-core/lib/middleman-core/renderers/haml.rb
View file

@ -51,10 +51,9 @@ module Middleman
def add_exposed_to_context(context) def add_exposed_to_context(context)
super super
context.init_haml_helpers if context.respond_to?(:init_haml_helpers) context.init_haml_helpers if context.respond_to?(:init_haml_helpers)
end end
end end
end end
end end

2
middleman-core/lib/middleman-core/renderers/kramdown.rb
View file

@ -6,7 +6,7 @@ module Middleman
class KramdownTemplate < ::Tilt::KramdownTemplate class KramdownTemplate < ::Tilt::KramdownTemplate
def evaluate(scope, *) def evaluate(scope, *)
@output ||= begin @output ||= begin
MiddlemanKramdownHTML.scope = ::Middleman::Renderers::Haml.last_haml_scope || scope MiddlemanKramdownHTML.scope = (defined?(::Middleman::Renderers::Haml) && ::Middleman::Renderers::Haml.last_haml_scope) ? ::Middleman::Renderers::Haml.last_haml_scope : scope
output, warnings = MiddlemanKramdownHTML.convert(@engine.root, @engine.options) output, warnings = MiddlemanKramdownHTML.convert(@engine.root, @engine.options)
@engine.warnings.concat(warnings) @engine.warnings.concat(warnings)

1
middleman-core/lib/middleman-core/sitemap/extensions/redirects.rb
View file

@ -7,7 +7,6 @@ module Middleman
# Manages the list of proxy configurations and manipulates the sitemap # Manages the list of proxy configurations and manipulates the sitemap
# to include new resources based on those configurations # to include new resources based on those configurations
class Redirects < Extension class Redirects < Extension
# Expose `create_redirect` to config as `redirect` # Expose `create_redirect` to config as `redirect`
expose_to_config redirect: :create_redirect expose_to_config redirect: :create_redirect

1
middleman-core/lib/middleman-core/sitemap/extensions/request_endpoints.rb
View file

@ -4,7 +4,6 @@ module Middleman
module Sitemap module Sitemap
module Extensions module Extensions
class RequestEndpoints < Extension class RequestEndpoints < Extension
# Expose `create_endpoint` to config as `endpoint` # Expose `create_endpoint` to config as `endpoint`
expose_to_config endpoint: :create_endpoint expose_to_config endpoint: :create_endpoint