Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sort the css and js assets by numerical index

Browse Source
This commit is contained in:
Calen Pennington
2013-04-26 10:33:42 -04:00
parent fdaa708f80
commit 4a397972fa
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/lib/rooted_paths.py
View File

@@ -8,7 +8,7 @@ def rooted_glob(root, glob):
Uses glob2 globbing
"""
return remove_root(root, glob2.glob('{root}/{glob}'.format(root=root, glob=glob)))
return remove_root(root, sorted(glob2.glob('{root}/{glob}'.format(root=root, glob=glob))))
def remove_root(root, paths):

4
common/lib/xmodule/xmodule/static_content.py
View File

@@ -68,7 +68,7 @@ def _write_styles(selector, output_root, classes):
css_fragments[idx, filetype, fragment].add(class_.__name__)
css_imports = defaultdict(set)
for (idx, filetype, fragment), classes in sorted(css_fragments.items()):
fragment_name = "{idx}-{hash}.{type}".format(
fragment_name = "{idx:0=3d}-{hash}.{type}".format(
idx=idx,
hash=hashlib.md5(fragment).hexdigest(),
type=filetype)
@@ -102,7 +102,7 @@ def _write_js(output_root, classes):
module_js = []
for idx, filetype, fragment in sorted(js_fragments):
path = output_root / "{idx}-{hash}.{type}".format(
path = output_root / "{idx:0=3d}-{hash}.{type}".format(
idx=idx,
hash=hashlib.md5(fragment).hexdigest(),
type=filetype)