Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Read properly uglifier args #47

Merged
merged 1 commit into from
Jan 7, 2019
Merged

Read properly uglifier args #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions lib/jekyll-minifier.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def output_html(path, content)
opts = @site.config['jekyll-minifier']
if ( !opts.nil? )
# Javascript Arguments
js_args += opts[:uglifier_args] if opts.has_key?(:uglifier_args)
js_args[:uglifier_args] = Hash[opts['uglifier_args'].map{|(k,v)| [k.to_sym,v]}] if opts.has_key?('uglifier_args')

# HTML Arguments
html_args[:remove_spaces_inside_tags] = opts['remove_spaces_inside_tags'] if opts.has_key?('remove_spaces_inside_tags')
Expand Down Expand Up @@ -66,8 +66,8 @@ def output_html(path, content)

html_args[:css_compressor] = CSSminify2.new()

if ( !js_args.nil? )
html_args[:javascript_compressor] = Uglifier.new(js_args)
if ( !js_args[:uglifier_args].nil? )
html_args[:javascript_compressor] = Uglifier.new(js_args[:uglifier_args])
else
html_args[:javascript_compressor] = Uglifier.new()
end
Expand All @@ -81,16 +81,17 @@ def output_html(path, content)

def output_js(path, content)
if ( ENV['JEKYLL_ENV'] == "production" )
opts = @site.config['jekyll-minifier']
js_args = {}
opts = @site.config['jekyll-minifier']
compress = true
if ( !opts.nil? )
compress = opts['compress_javascript'] if opts.has_key?('compress_javascript')
js_args += opts[:js_args] if opts.has_key?(:js_args)
compress = opts['compress_javascript'] if opts.has_key?('compress_javascript')
js_args[:uglifier_args] = Hash[opts['uglifier_args'].map{|(k,v)| [k.to_sym,v]}] if opts.has_key?('uglifier_args')
end

if ( compress )
if ( !js_args.nil? )
compressor = Uglifier.new(js_args)
if ( !js_args[:uglifier_args].nil? )
compressor = Uglifier.new(js_args[:uglifier_args])
else
compressor = Uglifier.new()
end
Expand Down