Merge branch 'stable'

Conflicts:
	doc-src/SASS_CHANGELOG.md
This commit is contained in:
Nathan Weizenbaum 2009-10-21 13:50:38 -07:00
commit 35a6e46a1b
3 changed files with 20 additions and 1 deletions

View File

@ -51,6 +51,14 @@ Several bug fixes and minor improvements have been made, including:
* Displaying the expected strings as strings rather than regular expressions
whenever possible.
## 2.2.10 (Unreleased)
* Add support for attribute selectors with spaces around the `=`.
For example:
a[href = http://google.com]
color: blue
## [2.2.9](http://github.com/nex3/haml/commit/2.2.9)
There were no changes made to Sass between versions 2.2.8 and 2.2.9.

View File

@ -108,7 +108,7 @@ module Sass
MIXIN_INCLUDE_CHAR = ?+
# The regex that matches properties of the form <tt>name: prop</tt>.
PROPERTY_NEW_MATCHER = /^[^\s:"]+\s*[=:](\s|$)/
PROPERTY_NEW_MATCHER = /^[^\s:"\[]+\s*[=:](\s|$)/
# The regex that matches and extracts data from
# properties of the form <tt>name: prop</tt>.

View File

@ -758,6 +758,17 @@ foo {
CSS
end
def test_attribute_selector_with_spaces
assert_equal(<<CSS, render(<<SASS))
a b[foo = bar] {
c: d; }
CSS
a
b[foo = bar]
c: d
SASS
end
def test_quoted_colon
assert_equal(<<CSS, render(<<SASS))
a b[foo="bar: baz"] {