Skip to content
Snippets Groups Projects
Commit 6bc571e5 authored by Tim Fechner's avatar Tim Fechner
Browse files

Change javascript compiling behaviour

don't concatinate javascript files
parent 5d04d269
No related branches found
No related tags found
No related merge requests found
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
{% block pre-script %}{% endblock %} {% block pre-script %}{% endblock %}
{% block script %} {% block script %}
{% if debug %} {% if debug %}
<script type="text/javascript" src="{% static 'hshassets/script.js' %}"></script> <script type="text/javascript" src="{% static 'hshassets/js/jquery-3.2.1.js' %}"></script>
{% else %} {% else %}
<script type="text/javascript" src="{% static 'hshassets/script.min.js' %}"></script> <script type="text/javascript" src="{% static 'hshassets/js/jquery-3.2.1.min.js' %}"></script>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block post-script %}{% endblock %} {% block post-script %}{% endblock %}
......
...@@ -95,20 +95,22 @@ def build_javascript(app_name, app_directories, verbose=True): ...@@ -95,20 +95,22 @@ def build_javascript(app_name, app_directories, verbose=True):
if f.endswith('.js'): if f.endswith('.js'):
js_files.append(root + '/' + f) js_files.append(root + '/' + f)
concatenated_javascript = ''
for js_file in js_files: for js_file in js_files:
with open(js_file, 'r') as f: with open(js_file, 'r') as infile:
concatenated_javascript += f.read() + '\n' content = infile.read()
minified_javascript = jsmin.jsmin(concatenated_javascript) dest_js_path = app_directories['static_path'] + '/js/'
dest_file_name = os.path.basename(js_file)
dest_file_name_stripped, dest_file_extenstion = os.path.splitext(dest_file_name)
if concatenated_javascript: if not os.path.isdir(dest_js_path):
with open(app_directories['static_path'] + '/script.js', 'w') as outfile: os.makedirs(dest_js_path)
outfile.write(concatenated_javascript)
if minified_javascript: with open(dest_js_path + dest_file_name, 'w') as outfile:
with open(app_directories['static_path'] + '/script.min.js', 'w') as outfile: outfile.write(content + '\n')
outfile.write(minified_javascript)
with open(dest_js_path + dest_file_name_stripped + '.min' + dest_file_extenstion, 'w') as outfile:
outfile.write(jsmin.jsmin(content))
if verbose: if verbose:
print('Finished after {:.3f} seconds\n'.format(time.time() - start)) print('Finished after {:.3f} seconds\n'.format(time.time() - start))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment