From 9441b7db71d2867f48a837eeaf5da0bf97c37617 Mon Sep 17 00:00:00 2001 From: Aaron Huang Date: Fri, 12 Dec 2014 20:06:06 +0800 Subject: [PATCH 1/2] Use config.assests.js_compressor setting for save original js compressor --- lib/tasks/requirejs-rails_tasks.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/requirejs-rails_tasks.rake b/lib/tasks/requirejs-rails_tasks.rake index 48240378..0fafdc2d 100644 --- a/lib/tasks/requirejs-rails_tasks.rake +++ b/lib/tasks/requirejs-rails_tasks.rake @@ -95,7 +95,7 @@ OS X Homebrew users can use 'brew install node'. # Save the original JS compressor and cache, which will be restored later. - original_js_compressor = requirejs.env.js_compressor + original_js_compressor = Rails.application.config.assets.js_compressor requirejs.env.js_compressor = false original_cache = requirejs.env.cache From f525afc79092c039f3bc12d6388c7eb11b024399 Mon Sep 17 00:00:00 2001 From: Aaron Huang Date: Tue, 16 Dec 2014 13:04:19 +0800 Subject: [PATCH 2/2] Add config.requirejs.js_compressor If user doesn't set the `config.requirejs.js_compressor, use js_compressor of Sprockets in default. --- lib/requirejs/rails/config.rb | 1 + lib/requirejs/rails/engine.rb | 2 ++ lib/tasks/requirejs-rails_tasks.rake | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/requirejs/rails/config.rb b/lib/requirejs/rails/config.rb index 93862abf..8db42ec1 100644 --- a/lib/requirejs/rails/config.rb +++ b/lib/requirejs/rails/config.rb @@ -14,6 +14,7 @@ class Config < ::ActiveSupport::OrderedOptions def initialize(application) super self.manifest = nil + self.js_compressor = nil self.logical_asset_filter = [/\.js$/, /\.html$/, /\.txt$/] self.tmp_dir = application.root + 'tmp' diff --git a/lib/requirejs/rails/engine.rb b/lib/requirejs/rails/engine.rb index 995dce06..7c957053 100644 --- a/lib/requirejs/rails/engine.rb +++ b/lib/requirejs/rails/engine.rb @@ -20,6 +20,8 @@ class Engine < ::Rails::Engine config.assets.precompile += config.requirejs.precompile + config.requirejs.js_compressor ||= config.assets.js_compressor + # Check for the `requirejs:precompile:all` top-level Rake task and run the following initialization code. if defined?(Rake.application) && Rake.application.top_level_tasks == ["requirejs:precompile:all"] # Prevent Sprockets from freezing the assets environment, which allows JS compression to be toggled on a per- diff --git a/lib/tasks/requirejs-rails_tasks.rake b/lib/tasks/requirejs-rails_tasks.rake index 0fafdc2d..0e83456f 100644 --- a/lib/tasks/requirejs-rails_tasks.rake +++ b/lib/tasks/requirejs-rails_tasks.rake @@ -95,7 +95,7 @@ OS X Homebrew users can use 'brew install node'. # Save the original JS compressor and cache, which will be restored later. - original_js_compressor = Rails.application.config.assets.js_compressor + original_js_compressor = requirejs.config.js_compressor requirejs.env.js_compressor = false original_cache = requirejs.env.cache