Skip to content

E
edx-platform
Commit 4debb4a2 by Toby Lawrence
Options

Merge pull request #11784 from edx/PERF-265 

Move any uncached JS to be cached
parents 5272b7e3 4eb95737
Showing with 7 additions and 7 deletions
lms/envs/common.py
...@@ -1633,7 +1633,11 @@ REQUIRE_ENVIRONMENT = "node" ...@@ -1633,7 +1633,11 @@ REQUIRE_ENVIRONMENT = "node"
# then you need to add the js urls in this list. # then you need to add the js urls in this list.
REQUIRE_JS_PATH_OVERRIDES = [ REQUIRE_JS_PATH_OVERRIDES = [
'js/bookmarks/views/bookmark_button.js', 'js/bookmarks/views/bookmark_button.js',
'js/views/message_banner.js' 'js/views/message_banner.js',
'js/vendor/moment.min.js',
'js/vendor/url.min.js',
'js/courseware/course_home_events.js',
'js/courseware/toggle_element_visibility.js'
] ]
################################# CELERY ###################################### ################################# CELERY ######################################
......
lms/templates/courseware/courseware.html
...@@ -5,7 +5,6 @@ from django.utils.translation import ugettext as _ ...@@ -5,7 +5,6 @@ from django.utils.translation import ugettext as _
from django.template.defaultfilters import escapejs from django.template.defaultfilters import escapejs
from django.conf import settings from django.conf import settings
from edxnotes.helpers import is_feature_enabled as is_edxnotes_enabled from edxnotes.helpers import is_feature_enabled as is_edxnotes_enabled
from pipeline_mako import render_require_js_path_overrides
%> %>
<% <%
include_special_exams = settings.FEATURES.get('ENABLE_SPECIAL_EXAMS', False) and (course.enable_proctored_exams or course.enable_timed_exams) include_special_exams = settings.FEATURES.get('ENABLE_SPECIAL_EXAMS', False) and (course.enable_proctored_exams or course.enable_timed_exams)
...@@ -16,10 +15,6 @@ from pipeline_mako import render_require_js_path_overrides ...@@ -16,10 +15,6 @@ from pipeline_mako import render_require_js_path_overrides
<%block name="bodyclass">view-in-course view-courseware courseware ${course.css_class or ''}</%block> <%block name="bodyclass">view-in-course view-courseware courseware ${course.css_class or ''}</%block>
<%block name="js_overrides">
${render_require_js_path_overrides(settings.REQUIRE_JS_PATH_OVERRIDES)}
</%block>
<%block name="title"><title> <%block name="title"><title>
% if section_title: % if section_title:
${static.get_page_title_breadcrumbs(section_title, course_name())} ${static.get_page_title_breadcrumbs(section_title, course_name())}
......
lms/templates/main.html
...@@ -6,6 +6,7 @@ from django.utils.http import urlquote_plus ...@@ -6,6 +6,7 @@ from django.utils.http import urlquote_plus
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.utils.translation import get_language_bidi from django.utils.translation import get_language_bidi
from branding import api as branding_api from branding import api as branding_api
from pipeline_mako import render_require_js_path_overrides
%> %>
<!DOCTYPE html> <!DOCTYPE html>
<!--[if lte IE 9]><html class="ie ie9 lte9" lang="${LANGUAGE_CODE}"><![endif]--> <!--[if lte IE 9]><html class="ie ie9 lte9" lang="${LANGUAGE_CODE}"><![endif]-->
...@@ -77,8 +78,8 @@ from branding import api as branding_api ...@@ -77,8 +78,8 @@ from branding import api as branding_api
}).call(this, require || RequireJS.require); }).call(this, require || RequireJS.require);
</script> </script>
<script type="text/javascript" src="${static.url("lms/js/require-config.js")}"></script> <script type="text/javascript" src="${static.url("lms/js/require-config.js")}"></script>
<%block name="js_overrides"> <%block name="js_overrides">
${render_require_js_path_overrides(settings.REQUIRE_JS_PATH_OVERRIDES)}
</%block> </%block>
% if not disable_courseware_js: % if not disable_courseware_js:
......
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