File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -44,7 +44,7 @@ class Compressor
4444 COMPRESSORS = {
4545 :yui => YUI ::JavaScriptCompressor ,
4646 :closure => Closure ::Compiler ,
47- :uglifier => ::Uglifier
47+ :uglifier => Jammit ::Uglifier
4848 }
4949
5050 DEFAULT_OPTIONS = {
@@ -70,7 +70,7 @@ def compress_js(paths)
7070 else
7171 js = concatenate ( paths - jst_paths ) + compile_jst ( jst_paths )
7272 end
73- Jammit . compress_assets ? compressed_js ( js ) : js
73+ Jammit . compress_assets ? @js_compressor . compress ( js ) : js
7474 end
7575
7676 # Concatenate and compress a list of CSS stylesheets. When compressing a
@@ -110,11 +110,6 @@ def compile_jst(paths)
110110
111111
112112 private
113-
114- # Returns a compressed javascript source using appropriate method of js compressor
115- def compressed_js ( js )
116- @js_compressor . respond_to? ( :compress ) ? @js_compressor . compress ( js ) : @js_compressor . compile ( js )
117- end
118113
119114 # Given a set of paths, find a common prefix path.
120115 def find_base_path ( paths )
Original file line number Diff line number Diff line change 1616Jammit . load_configuration ( Jammit ::DEFAULT_CONFIG_PATH , true ) if defined? ( Rails )
1717
1818# Jammit Core:
19+ require 'jammit/uglifier'
1920require 'jammit/compressor'
2021require 'jammit/packager'
2122
Original file line number Diff line number Diff line change 1+ class Jammit ::Uglifier < Uglifier
2+ alias :compress :compile
3+ end
You can’t perform that action at this time.
0 commit comments