Rooba
/
tornado
mirror of https://github.com/tornadoweb/tornado.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support https for UIModule javascript_files and css_files. 

Closes #256.
This commit is contained in:
Ben Darnell 2011-05-01 11:59:11 -07:00
parent f04b2dc456
commit bae1b57193
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tornado/web.py
View File

@ -446,12 +446,14 @@ class RequestHandler(object):
if head_part: html_heads.append(_utf8(head_part))
body_part = module.html_body()
if body_part: html_bodies.append(_utf8(body_part))
def is_absolute(path):
return any(path.startswith(x) for x in ["/", "http:", "https:"])
if js_files:
# Maintain order of JavaScript files given by modules
paths = []
unique_paths = set()
for path in js_files:
if not path.startswith("/") and not path.startswith("http:"):
if not is_absolute(path):
path = self.static_url(path)
if path not in unique_paths:
paths.append(path)
@ -470,7 +472,7 @@ class RequestHandler(object):
paths = []
unique_paths = set()
for path in css_files:
if not path.startswith("/") and not path.startswith("http:"):
if not is_absolute(path):
path = self.static_url(path)
if path not in unique_paths:
paths.append(path)