Merge pull request #433 from ehamiter/master

Add '#' to constant NON_REWRITEABLE_URL
jazzband · Mar 8, 2015 · d0c073f · d0c073f
2 parents e3dda64 + 52ff8f5
commit d0c073f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -39,6 +39,7 @@ or just made Pipeline more awesome.
  * Denis V Seleznyov <code@xy2.ru>
  * DJ Sharkey <dj@newscred.com>
  * Edwin Lunando <edwinlunando@gmail.com>
+ * Eric Hamiter <ehamiter@gmail.com>
  * Evan Myller <eMyller@7ws.co>
  * Fabian Büchler <fabian.buechler@gmail.com>
  * Feanil Patel <feanil@edx.org>

diff --git a/pipeline/compressors/__init__.py b/pipeline/compressors/__init__.py
@@ -16,7 +16,7 @@
 
 URL_DETECTOR = r"""url\((['"]){0,1}\s*(.*?)["']{0,1}\)"""
 URL_REPLACER = r"""url\(__EMBED__(.+?)(\?\d+)?\)"""
-NON_REWRITABLE_URL = re.compile(r'^(http:|https:|data:|//)')
+NON_REWRITABLE_URL = re.compile(r'^(#|http:|https:|data:|//)')
 
 DEFAULT_TEMPLATE_FUNC = "template"
 TEMPLATE_FUNC = r"""var template = function(str){var fn = new Function('obj', 'var __p=[],print=function(){__p.push.apply(__p,arguments);};with(obj||{}){__p.push(\''+str.replace(/\\/g, '\\\\').replace(/'/g, "\\'").replace(/<%=([\s\S]+?)%>/g,function(match,code){return "',"+code.replace(/\\'/g, "'")+",'";}).replace(/<%([\s\S]+?)%>/g,function(match,code){return "');"+code.replace(/\\'/g, "'").replace(/[\r\n\t]/g,' ')+"__p.push('";}).replace(/\r/g,'\\r').replace(/\n/g,'\\n').replace(/\t/g,'\\t')+"');}return __p.join('');");return fn;};"""

diff --git a/tests/assets/css/urls.css b/tests/assets/css/urls.css
@@ -21,4 +21,7 @@
 .no-protocol-url {
   background-image: url(//images/sprite-buttons.png);
 }
+.anchor-tag-url {
+  background-image: url(#image-gradient);
+}
 @font-face{src:url(../fonts/pipeline.eot);src:url(../fonts/pipeline.eot?#iefix) format('embedded-opentype'),url(../fonts/pipeline.woff) format('woff'),url(../fonts/pipeline.ttf) format('truetype');}
diff --git a/tests/tests/test_compressor.py b/tests/tests/test_compressor.py
@@ -153,6 +153,9 @@ def test_url_rewrite(self):
 .no-protocol-url {
   background-image: url(//images/sprite-buttons.png);
 }
+.anchor-tag-url {
+  background-image: url(#image-gradient);
+}
 @font-face{src:url(../pipeline/fonts/pipeline.eot);src:url(../pipeline/fonts/pipeline.eot?#iefix) format('embedded-opentype'),url(../pipeline/fonts/pipeline.woff) format('woff'),url(../pipeline/fonts/pipeline.ttf) format('truetype');}
 """, output)