Skip to content
Browse files

Merge branch 'stable' of https://github.com/nex3/sass into stable_wit…

…h_moved_updating_stylesheet_hook

Conflicts:
	doc-src/SASS_CHANGELOG.md
  • Loading branch information...
2 parents b39ebfc + 58ad24d commit deb52e24aa1fc17715d342c845b5f60207211c29 @ChristianPeters ChristianPeters committed Oct 3, 2011
Showing with 16 additions and 9 deletions.
  1. +1 −1 VERSION
  2. +12 −5 doc-src/SASS_CHANGELOG.md
  3. +1 −1 lib/sass/exec.rb
  4. +1 −1 lib/sass/tree/visitors/deep_copy.rb
  5. +1 −1 lib/sass/tree/visitors/set_options.rb
View
2 VERSION
@@ -1 +1 @@
-3.1.7
+3.1.8
View
17 doc-src/SASS_CHANGELOG.md
@@ -3,7 +3,14 @@
* Table of contents
{:toc}
-## 3.1.8 (Unreleased)
+## 3.1.9 (Unreleased)
+
+* Add new updated_stylesheet callback, which is run after the stylesheet has
+ been successfully compiled. The old callback updating_stylesheet,
+ which is run before compiling, is deprecated and will be removed in a
+ future release.
+
+## 3.1.8
* Deprecate parent selectors followed immediately by identifiers (e.g. `&foo`).
This should never have worked, since it violates the rule
@@ -34,10 +41,10 @@
* Properly validate the nesting of elements in imported stylesheets.
-* Add new updated_stylesheet callback, which is run after the stylesheet has
- been successfully compiled. The old callback updating_stylesheet,
- which is run before compiling, is deprecated and will be removed in a
- future release.
+* Properly compile files in parent directories with `--watch` and `--update`.
+
+* Properly null out options in mixin definitions before caching them. This fixes
+ a caching bug that has been plaguing some Rails 3.1 users.
## 3.1.7
View
2 lib/sass/exec.rb
@@ -385,7 +385,7 @@ def watch_or_update
dirs, files = @args.map {|name| split_colon_path(name)}.
partition {|i, _| File.directory? i}
- files.map! {|from, to| [from, to || from.gsub(/\..*?$/, '.css')]}
+ files.map! {|from, to| [from, to || from.gsub(/\.[^.]*?$/, '.css')]}
dirs.map! {|from, to| [from, to || from]}
::Sass::Plugin.options[:template_location] = dirs
View
2 lib/sass/tree/visitors/deep_copy.rb
@@ -43,7 +43,7 @@ def visit_if(node)
yield
end
- def visit_mixin_def(node)
+ def visit_mixindef(node)
node.args = node.args.map {|k, v| [k.deep_copy, v && v.deep_copy]}
yield
end
View
2 lib/sass/tree/visitors/set_options.rb
@@ -50,7 +50,7 @@ def visit_if(node)
yield
end
- def visit_mixin_def(node)
+ def visit_mixindef(node)
node.args.each do |k, v|
k.options = @options
v.options = @options if v

0 comments on commit deb52e2

Please sign in to comment.
Something went wrong with that request. Please try again.