Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Commit

Permalink
Merge pull request #153 from edx/compressor-require-fix
Browse files Browse the repository at this point in the history
Loading application-main separately from RequireJS
  • Loading branch information
clintonb committed Oct 2, 2014
2 parents f2cfc98 + 7fda66d commit f8862bf
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion analytics_dashboard/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ <h1>{{ page_title }}</h1>

{% compress js %}
<script src="{% static 'js/common.js' %}"></script>
<script data-main="{% static 'js/application-main.js' %}" src="{% static 'vendor/require.js' %}"></script>
<script src="{% static 'vendor/require.js' %}"></script>

{# Note: django-compressor does not recognize the data-main attribute. Load the main script separately. #}
<script src="{% static 'js/application-main.js' %}"></script>

{% block javascript %}
{% endblock javascript %}
Expand Down

0 comments on commit f8862bf

Please sign in to comment.