lib/jammit/compressor.rb in jammit-0.2.2 vs lib/jammit/compressor.rb in jammit-0.2.3

- old
+ new

@@ -39,10 +39,10 @@ # the "yui-compressor" gem, or the internal Closure Compiler from the # "closure-compiler" gem. def initialize @css_compressor = YUI::CssCompressor.new flavor = Jammit.javascript_compressor - js_options = (DEFAULT_OPTIONS[flavor] || {}).merge(Jammit.compressor_options) + js_options = DEFAULT_OPTIONS[flavor].merge(Jammit.compressor_options) @js_compressor = flavor == :closure ? Closure::Compiler.new(js_options) : YUI::JavaScriptCompressor.new(js_options) end