Add less, sass and escaped filters #55
Conversation
…oser match to output from real Haml compiler
| # ---------------------------------------------------------------------------------- | ||
|
|
||
| def plain(text, options): | ||
| return text |
There was a problem hiding this comment.
Currently each filter handles indentation separately but now, like the Ruby implementation, indentation is handled outside of the filter.
| @@ -9,14 +9,14 @@ | |||
|
|
|||
| should } not be interpreted as a multiline string | |||
| :css | |||
| .test { | |||
There was a problem hiding this comment.
This is mostly replacing tabs with spaces
| @@ -2,78 +2,77 @@ | |||
| These { { braces | |||
|
|
|||
| should } not be interpreted as a multiline string | |||
| These { { braces

 should } not be interpreted as a multiline string | |||
| These { { braces

should } not be interpreted as a multiline string | |||
There was a problem hiding this comment.
This is consistent with how the Haml filter works
| // <![CDATA[ | ||
| // ]]> | ||
| //<
| @@ -14,6 +14,7 @@ class Compiler: | |||
| 'django_inline_style': False, # support both #{...} and ={...} | |||
| 'tag_config': 'django', # Django vs Jinja2 tags | |||
| 'custom_self_closing_tags': {}, # additional self-closing tags | |||
| 'cdata': True, # wrap CSS, Javascript etc content in CDATA section | |||
There was a problem hiding this comment.
CDATA usage isn't required in HTML5 so making it optional here like in Ruby Haml
| The implementation of these should match https://github.com/haml/haml/blob/master/lib/haml/filters.rb as closely as | ||
| possible. Where we differ is that we don't compile Stylus, Coffeescript etc into CSS or Javascript - but place the | ||
| content into suitable <style> and <script> that can be transformed later by something like django-compressor. | ||
| """ |
There was a problem hiding this comment.
I wonder if we should consider this.. that is turning :sass blocks into native CSS.
There was a problem hiding this comment.
I feel like I only just about understand how a :coffee section currently ends up as compressed js, but wouldn't that mean that the coffee→js / sass→css compilation has to happen for every request? Is it time we tried using cached templates?
There was a problem hiding this comment.
We of course need the compress tag to have sass/less/coffee converted during offline compression, e.g.
- compress js
:coffee
foo=bar
- compress css
:sass
.mystyle {...}There was a problem hiding this comment.
Ya, I think what I was thinking of was closer to:
-compress css inline
:sass
.mystyle {...}
In that you want it converted and inserted directly.
There was a problem hiding this comment.
Sure and that means the sass compilation happens every time that template is requested? Maybe that's not a big deal and/or caching of templates works?
There was a problem hiding this comment.
Well Simpla will def be compressing offline.
There was a problem hiding this comment.
I meant just template caching - to avoid haml→html compilation for every request
There was a problem hiding this comment.
Well now I'm confused, won't the offline compression do that? Or is that not converting haml to html at that point?
There was a problem hiding this comment.
I thought that just extracted the js and css? Each request still requires compiling the Haml into html. Now I'm confused
There was a problem hiding this comment.
I think you are right.. well sheesh, that seems like something we should fix. I don't even like that happening with per-process caching.
Also makes some simplifications to filter code and brings us closer to the output from the Ruby Haml implementation