Separating out Rails2 actionpack integration logic
Rails3 has different internal implementations on ActionPack which is causing breakage when trying to calculate image_paths. Lets only calculate this logic for Rails 2 at the moment, and figure out what to do with Rails3 later
This commit is contained in:
parent
3dd2a90dec
commit
719cd980ae
@ -1,10 +1,14 @@
|
|||||||
unless defined?(Compass::RAILS_LOADED)
|
unless defined?(Compass::RAILS_LOADED)
|
||||||
Compass::RAILS_LOADED = true
|
Compass::RAILS_LOADED = true
|
||||||
|
|
||||||
%w(action_controller sass_plugin urls).each do |lib|
|
if ActionPack::VERSION::MAJOR >= 3
|
||||||
require "compass/app_integration/rails/#{lib}"
|
# figure something out so image_path works with rails integration
|
||||||
|
else
|
||||||
|
%w(action_controller sass_plugin urls).each do |lib|
|
||||||
|
require "compass/app_integration/rails/actionpack2/#{lib}"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Wierd that this has to be re-included to pick up sub-modules. Ruby bug?
|
# Wierd that this has to be re-included to pick up sub-modules. Ruby bug?
|
||||||
class Sass::Script::Functions::EvaluationContext
|
class Sass::Script::Functions::EvaluationContext
|
||||||
include Sass::Script::Functions
|
include Sass::Script::Functions
|
||||||
|
Loading…
Reference in New Issue
Block a user