@@ -3,6 +3,10 @@ * Table of contents {:toc} +## [2.2.12](http://github.com/nex3/haml/commit/2.2.12) + +There were no changes made to Sass between versions 2.2.11 and 2.2.12. + ## [2.2.11](http://github.com/nex3/haml/commit/2.2.11) * Fixed a bug with XSS protection where HTML escaping would raise an error doc-src/HAML_CHANGELOG.md @@ -3,6 +3,10 @@ * Table of contents {:toc} +## [2.2.12](http://github.com/nex3/haml/commit/2.2.12) + +* Fix a stupid bug introduced in 2.2.11 that broke the Sass Rails plugin. + ## [2.2.11](http://github.com/nex3/haml/commit/2.2.11) * Added a note to errors on properties that could be pseudo-classes (e.g. `:focus`) doc-src/SASS_CHANGELOG.md @@ -49,6 +49,17 @@ module Sass opts end + # Same as \{#update\_stylesheets}, but respects \{#checked\_for\_updates} + # and the {file:SASS_REFERENCE.md#always_update-option `:always_update`} + # and {file:SASS_REFERENCE.md#always_check-option `:always_check`} options. + # + # @see #update_stylesheets + def check_for_updates + return unless !Sass::Plugin.checked_for_updates || + Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check] + update_stylesheets + end + # Updates out-of-date stylesheets. # # Checks each Sass file in {file:SASS_REFERENCE.md#template_location-option `:template_location`} lib/sass/plugin.rb @@ -7,22 +7,15 @@ unless defined?(Sass::RAILS_LOADED) :always_check => RAILS_ENV != "production", :full_exception => RAILS_ENV != "production") - check = lambda do - if !Sass::Plugin.checked_for_updates || - Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check] - Sass::Plugin.update_stylesheets - end - end - if defined?(ActionDispatch::Callbacks.to_prepare) # Rails >= 3.0.0 - ActionDispatch::Callbacks.to_prepare(&check) + ActionDispatch::Callbacks.to_prepare {Sass::Plugin.check_for_updates} else module ActionController class Base alias_method :sass_old_process, :process def process(*args) - check.call + Sass::Plugin.check_for_updates sass_old_process(*args) end end lib/sass/plugin/rails.rb 7f8bfc8bd0ba556894a70ea16ef96363d1dc8555 b13bebcea60ff8e3b8aacc68258718f6570bc556 Nathan Weizenbaum nex342@gmail.com http://github.com/nex3/haml/commit/45062c18fe107ed16428324568f6fdc0fcba86af 45062c18fe107ed16428324568f6fdc0fcba86af 2009-11-05T22:58:02-08:00 2009-11-05T22:58:02-08:00 Merge branch 'stable' Conflicts: VERSION doc-src/HAML_CHANGELOG.md doc-src/SASS_CHANGELOG.md 800d30b0c38d38033dac136906584961f002811f Nathan Weizenbaum nex342@gmail.com