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

better ruby style on some changes

i18n_v4
Thomas Reynolds 2014-01-04 12:44:20 -08:00
parent 504a1c2eba
commit 1dc9b97a5e
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
View File

@ -201,9 +201,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
# or a Resource, this will produce the nice URL configured for that
# path, respecting :relative_links, directory indexes, etc.
def url_for(path_or_resource, options={})
options_with_resource = options.dup
options_with_resource[:current_resource] ||= current_resource
options_with_resource = options.merge(current_resource: current_resource)
::Middleman::Util.url_for(app, path_or_resource, options_with_resource)
end
@ -236,12 +234,7 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
args[url_arg_index] = url_for(url, options)
# Cleanup before passing to Padrino
options.delete(:relative)
options.delete(:current_resource)
options.delete(:find_resource)
options.delete(:query)
options.delete(:anchor)
options.delete(:fragment)
options.except!(:relative, :current_resource, :find_resource, :query, :anchor, :fragment)
end
super(*args, &block)