kotovalexarian-likes-github/haml--haml
1
0
Fork 0
mirror of https://github.com/haml/haml.git synced 2022-11-09 12:33:31 -05:00
Code Releases Activity

Merge branch 'stable'

Browse source 
Conflicts:
	doc-src/SASS_CHANGELOG.md
This commit is contained in:
Nathan Weizenbaum 2009-09-23 02:41:51 -07:00
commit 6e5bc03012
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc-src/HAML_CHANGELOG.md
View file

@ -28,6 +28,10 @@ of the many and varied [Haml implementations](http://en.wikipedia.org/wiki/Haml#
* Made the error message when unable to load a dependency for html2haml * Made the error message when unable to load a dependency for html2haml
respect the `--trace` option. respect the `--trace` option.
* Don't crash when the `__FILE__` constant of a Ruby file is a relative path,
as apparently happens sometimes in TextMate
(thanks to [Karl Varga](http://github.com/kjvarga).
## [2.2.5](http://github.com/nex3/haml/commit/2.2.5) ## [2.2.5](http://github.com/nex3/haml/commit/2.2.5)
* Got rid of trailing whitespace produced when opening a conditional comment * Got rid of trailing whitespace produced when opening a conditional comment

6
doc-src/SASS_CHANGELOG.md
View file

@ -16,6 +16,12 @@ In addition, when the `sass` executable encounters an error,
it now prints the filename where the error occurs, it now prints the filename where the error occurs,
as well as a backtrace of Sass imports. as well as a backtrace of Sass imports.
## 2.2.6 (Unreleased)
* Don't crash when the `__FILE__` constant of a Ruby file is a relative path,
as apparently happens sometimes in TextMate
(thanks to [Karl Varga](http://github.com/kjvarga).
## [2.2.5](http://github.com/nex3/haml/commit/2.2.5) ## [2.2.5](http://github.com/nex3/haml/commit/2.2.5)
There were no changes made to Sass between versions 2.2.4 and 2.2.5. There were no changes made to Sass between versions 2.2.4 and 2.2.5.

2
lib/haml/util.rb
View file

@ -15,7 +15,7 @@ module Haml
# @param file [String] The filename relative to the Haml root # @param file [String] The filename relative to the Haml root
# @return [String] The filename relative to the the working directory # @return [String] The filename relative to the the working directory
def scope(file) def scope(file)
File.join(File.dirname(File.dirname(File.dirname(__FILE__))), file) File.join(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__)))), file)
end end
# Converts an array of `[key, value]` pairs to a hash. # Converts an array of `[key, value]` pairs to a hash.