Commit e82f0948 by andreas.pelme

initial support for external urls

git-svn-id: https://django-compress.googlecode.com/svn/trunk@77 98d35234-f74b-0410-9e22-51d878bdf110
parent 78daeb80
...@@ -14,8 +14,11 @@ def render_common(template_name, obj, filename, version): ...@@ -14,8 +14,11 @@ def render_common(template_name, obj, filename, version):
filename = get_output_filename(filename, version) filename = get_output_filename(filename, version)
context = obj.get('extra_context', {}) context = obj.get('extra_context', {})
context['url'] = media_url(filename) if filename.startswith('http://'):
context['url'] = filename
else:
context['url'] = media_url(filename)
return template.loader.render_to_string(template_name, context) return template.loader.render_to_string(template_name, context)
def render_css(css, filename, version=None): def render_css(css, filename, version=None):
...@@ -65,7 +68,13 @@ class CompressedJSNode(template.Node): ...@@ -65,7 +68,13 @@ class CompressedJSNode(template.Node):
js = settings.COMPRESS_JS[js_name] js = settings.COMPRESS_JS[js_name]
except KeyError: except KeyError:
return '' # fail silently, do not return anything if an invalid group is specified return '' # fail silently, do not return anything if an invalid group is specified
if 'external_urls' in js:
r = ''
for url in js['external_urls']:
r += render_js(js, url)
return r
if settings.COMPRESS: if settings.COMPRESS:
version = None version = None
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment