aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/sprockets
diff options
context:
space:
mode:
authorDaniel Schierbeck <daniel.schierbeck@gmail.com>2011-08-22 16:50:33 +0200
committerDaniel Schierbeck <daniel.schierbeck@gmail.com>2011-08-22 16:50:33 +0200
commitdb181bddb646ff22c85218072ba5c69ca680dabd (patch)
tree2ace9e399797b4bfbf668d7bd04461f119713f52 /actionpack/lib/sprockets
parentaae5ebf3eb7d17e668bb05f9c859e239f31b9f50 (diff)
downloadrails-db181bddb646ff22c85218072ba5c69ca680dabd.tar.gz
rails-db181bddb646ff22c85218072ba5c69ca680dabd.tar.bz2
rails-db181bddb646ff22c85218072ba5c69ca680dabd.zip
Refactor Sprockets::Helpers::RailsHelper#performing_caching?
No need for them lines to get so long! Also, move that comment into the method body where it belongs!
Diffstat (limited to 'actionpack/lib/sprockets')
-rw-r--r--actionpack/lib/sprockets/helpers/rails_helper.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index 69306ef631..cb01532449 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -139,9 +139,14 @@ module Sprockets
end
end
- # When included in Sprockets::Context, we need to ask the top-level config as the controller is not available
def performing_caching?
- config.action_controller.present? ? config.action_controller.perform_caching : config.perform_caching
+ # When included in Sprockets::Context, we need to ask the
+ # top-level config as the controller is not available.
+ if config.action_controller.present?
+ config.action_controller.perform_caching
+ else
+ config.perform_caching
+ end
end
end
end