github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Rails] Fixed bug introduced in 0.8.3.

Browse Source
This commit is contained in:
Chris Eppstein 2009-07-06 11:47:02 -07:00
parent f8987b8165
commit 43cb64d77e
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.markdown
View File

@ -1,6 +1,11 @@
COMPASS CHANGELOG COMPASS CHANGELOG
================= =================
0.8.4 (July 06, 2009)
---------------------
Fixed a bug in rails integration introduced in 0.8.3.
0.8.3 (July 06, 2009) 0.8.3 (July 06, 2009)
--------------------- ---------------------

2
lib/compass/app_integration/rails.rb
View File

@ -2,7 +2,7 @@ unless defined?(Compass::RAILS_LOADED)
Compass::RAILS_LOADED = true Compass::RAILS_LOADED = true
require File.join(File.dirname(__FILE__), 'rails', 'action_controller') require File.join(File.dirname(__FILE__), 'rails', 'action_controller')
require File.join(File.dirname(__FILE__), 'rails', 'sass_plugin') require File.join(File.dirname(__FILE__), 'rails', 'sass_plugin')
require File.join(File.dirname(__FILE__), 'rails', 'image_url') require File.join(File.dirname(__FILE__), 'rails', 'urls')
# 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

2
lib/compass/app_integration/rails/image_url.rb → lib/compass/app_integration/rails/urls.rb
View File

@ -1,4 +1,4 @@
module Compass::SassExtensions::Functions::ImageUrl module Compass::SassExtensions::Functions::Urls
def image_url_with_rails_integration(path) def image_url_with_rails_integration(path)
if @controller = Sass::Plugin.rails_controller if @controller = Sass::Plugin.rails_controller
begin begin