Skip to content

Commit 05fdcb0

Browse files
committed
Actually sets :jsmin as DEFAULT_JAVASCRIPT_COMPRESSOR AND :cssmin as DEFAULT_CSS_COMPRESSOR. They both are loaded inside lib/jammit/dependencies.rb
1 parent 28ddf14 commit 05fdcb0

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

lib/jammit.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ module Jammit
2424

2525
JAVASCRIPT_COMPRESSORS = [:jsmin, :yui, :closure, :uglifier]
2626

27-
DEFAULT_JAVASCRIPT_COMPRESSOR = :yui
27+
DEFAULT_JAVASCRIPT_COMPRESSOR = :jsmin
2828

2929
CSS_COMPRESSORS = [:cssmin, :yui, :sass]
3030

31-
DEFAULT_CSS_COMPRESSOR = :yui
31+
DEFAULT_CSS_COMPRESSOR = :cssmin
3232

3333
# Extension matchers for JavaScript and JST, which need to be disambiguated.
3434
JS_EXTENSION = /\.js\Z/
@@ -93,6 +93,7 @@ def self.load_configuration(config_path, soft=false)
9393
@compressor_options = symbolize_keys(conf[:compressor_options] || {})
9494
@css_compressor_options = symbolize_keys(conf[:css_compressor_options] || {})
9595
set_javascript_compressor(conf[:javascript_compressor])
96+
set_css_compressor(conf[:css_compressor])
9697
set_package_assets(conf[:package_assets])
9798
set_template_function(conf[:template_function])
9899
set_template_namespace(conf[:template_namespace])

lib/jammit/dependencies.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
Jammit.load_configuration(Jammit::DEFAULT_CONFIG_PATH, true) if defined?(Rails)
4343

4444
# Jammit Core:
45+
require 'jsmin'
46+
require 'cssmin'
4547
require 'jammit/jsmin_compressor'
4648
require 'jammit/cssmin_compressor'
4749
require 'jammit/compressor'

0 commit comments

Comments
 (0)