diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bcc9ea..473484a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ Please also have a look at the [Haml Coffee Changelog](https://github.com/9elements/haml-coffee/blob/master/CHANGELOG.md). +## 0.9.1 - Mail 14, 2012 + +- Upgrade to Haml Coffee 0.7.1 + ## 0.9.0 - Mail 9, 2012 - Upgrade to Haml Coffee 0.7.0 diff --git a/lib/haml_coffee_assets/version.rb b/lib/haml_coffee_assets/version.rb index d0de2d8..52fd419 100644 --- a/lib/haml_coffee_assets/version.rb +++ b/lib/haml_coffee_assets/version.rb @@ -1,5 +1,5 @@ # coding: UTF-8 module HamlCoffeeAssets - VERSION = '0.9.0' unless defined?(HamlCoffeeAssets::VERSION) + VERSION = '0.9.1' unless defined?(HamlCoffeeAssets::VERSION) end diff --git a/lib/js/haml-coffee.js b/lib/js/haml-coffee.js index 22c2672..1c05a99 100644 --- a/lib/js/haml-coffee.js +++ b/lib/js/haml-coffee.js @@ -1087,7 +1087,7 @@ require.define("/nodes/haml.js", function (require, module, exports, __dirname, doctype: doctype }; } - tokens = exp.match(/^((?:[#%\.][a-z0-9_:\-]*[\/]?)+)(?:([\(\{].*[\)\}])?([\<\>]{0,2})(?=[=&!~])(.*)?|([\(\{].*[\)\}])?([\<\>]{0,2}))(.*)?/i); + tokens = exp.match(/^((?:[#%\.][a-z0-9_:\-]*[\/]?)+)(?:([\(].*[\)]|[\{].*[\}])?([\<\>]{0,2})(?=[=&!~])(.*)?|([\(].*[\)]|[\{].*[\}])?([\<\>]{0,2}))(.*)?/i); haml = tokens[1]; attributes = tokens[2] || tokens[5]; whitespace = tokens[3] || tokens[6];