[IMP] ir_qweb improve css minify
bzr revid: al@openerp.com-20140501190544-egvc85ctdxs69cmr
This commit is contained in:
parent
8d04c66dc3
commit
8c6cbebc0e
|
@ -1119,7 +1119,6 @@ class JavascriptAsset(WebAsset):
|
||||||
class StylesheetAsset(WebAsset):
|
class StylesheetAsset(WebAsset):
|
||||||
rx_import = re.compile(r"""@import\s+('|")(?!'|"|/|https?://)""", re.U)
|
rx_import = re.compile(r"""@import\s+('|")(?!'|"|/|https?://)""", re.U)
|
||||||
rx_url = re.compile(r"""url\s*\(\s*('|"|)(?!'|"|/|https?://|data:)""", re.U)
|
rx_url = re.compile(r"""url\s*\(\s*('|"|)(?!'|"|/|https?://|data:)""", re.U)
|
||||||
rx_comments = re.compile(r"""/\*.*\*/""", re.S)
|
|
||||||
rx_sourceMap = re.compile(r'(/\*# sourceMappingURL=.*)', re.U)
|
rx_sourceMap = re.compile(r'(/\*# sourceMappingURL=.*)', re.U)
|
||||||
|
|
||||||
def _get_content(self):
|
def _get_content(self):
|
||||||
|
@ -1156,8 +1155,13 @@ class StylesheetAsset(WebAsset):
|
||||||
|
|
||||||
def minify(self):
|
def minify(self):
|
||||||
# remove existing sourcemaps, make no sense after re-mini
|
# remove existing sourcemaps, make no sense after re-mini
|
||||||
return self.rx_sourceMap.sub('', self.content)
|
content = self.rx_sourceMap.sub('', self.content)
|
||||||
# return self.rx_comments.sub('', self.content)
|
# comments
|
||||||
|
content = re.sub(r'/\*.*?\*/', '', content, flags=re.S)
|
||||||
|
# space
|
||||||
|
content = re.sub(r'\s+', ' ', content)
|
||||||
|
content = re.sub(r' *([{}]) *', r'\1', content)
|
||||||
|
return content
|
||||||
|
|
||||||
def rjsmin(script):
|
def rjsmin(script):
|
||||||
""" Minify js with a clever regex.
|
""" Minify js with a clever regex.
|
||||||
|
|
Loading…
Reference in New Issue