From 5b081731ccfda3fbc1cfc450236566113da3ee27 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 17 Apr 2014 16:20:12 +0200 Subject: [PATCH] [FIX] remove existing sourcemaps in CSS files bzr revid: xmo@openerp.com-20140417142012-mhi8saeofkon5pe5 --- openerp/addons/base/ir/ir_qweb.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py index da0ce467f36..c5c9d2e8e63 100644 --- a/openerp/addons/base/ir/ir_qweb.py +++ b/openerp/addons/base/ir/ir_qweb.py @@ -1077,6 +1077,7 @@ class StylesheetAsset(WebAsset): rx_import = re.compile(r"""@import\s+('|")(?!'|"|/|https?://)""", 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) def _get_content(self): if self.source: @@ -1099,21 +1100,21 @@ class StylesheetAsset(WebAsset): if self.url: web_dir = os.path.dirname(self.url) - content = re.sub( - self.rx_import, + content = self.rx_import.sub( r"""@import \1%s/""" % (web_dir,), content, ) - content = re.sub( - self.rx_url, + content = self.rx_url.sub( r"url(\1%s/" % (web_dir,), content, ) return content - # def minify(self): - # return self.rx_comments.sub('', self.content) + def minify(self): + # remove existing sourcemaps, make no sense after re-mini + return self.rx_sourceMap.sub('', self.content) + # return self.rx_comments.sub('', self.content) def rjsmin(script): """ Minify js with a clever regex.