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

Importing bootstrap and popper through webpack.

Browse Source
This commit is contained in:
Harry Rein
2017-12-12 14:50:38 -05:00
parent 19406fa48f
commit 791b8b141e
4 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/templates/dashboard.html
View File

@@ -33,11 +33,6 @@ from student.models import CourseEnrollment
<%static:include path="dashboard/${template_name}.underscore" />
</script>
% endfor
% if course_entitlements:
<!-- This is a temporary solution before we land a fix to load these through Webpack, tracked by LEARNER-3483 -->
<script type="text/javascript" src="${static.url('common/js/vendor/popper.js')}"></script>
<script type="text/javascript" src="${static.url('common/js/vendor/bootstrap.js')}"></script>
% endif
</%block>
<%block name="js_extra">
@@ -52,6 +47,7 @@ from student.models import CourseEnrollment
});
});
</script>
<%static:webpack entry="Bootstrap"></%static:webpack>
<%static:require_module module_name="js/learner_dashboard/unenrollment_factory" class_name="UnenrollmentFactory">
UnenrollmentFactory({
urls: {

5
lms/templates/learner_dashboard/program_details_fragment.html
View File

@@ -9,10 +9,7 @@ from openedx.core.djangolib.js_utils import (
%>
<%block name="js_extra">
<!-- This is a temporary solution before we land a fix to load these through Webpack, tracked by LEARNER-3483 -->
<script type="text/javascript" src="${static.url('common/js/vendor/popper.js')}"></script>
<script type="text/javascript" src="${static.url('common/js/vendor/bootstrap.js')}"></script>
<%static:webpack entry="Bootstrap"></%static:webpack>
<%static:require_module module_name="js/learner_dashboard/program_details_factory" class_name="ProgramDetailsFactory">
ProgramDetailsFactory({
programData: ${program_data | n, dump_js_escaped_json},

6
themes/edx.org/lms/templates/dashboard.html
View File

@@ -34,11 +34,6 @@ from student.models import CourseEnrollment
<%static:include path="dashboard/${template_name}.underscore" />
</script>
% endfor
% if course_entitlements:
<!-- This is a temporary solution before we land a fix to load these through Webpack, tracked by LEARNER-3483 -->
<script type="text/javascript" src="${static.url('common/js/vendor/popper.js')}"></script>
<script type="text/javascript" src="${static.url('common/js/vendor/bootstrap.js')}"></script>
% endif
</%block>
<%block name="js_extra">
@@ -53,6 +48,7 @@ from student.models import CourseEnrollment
});
});
</script>
<%static:webpack entry="Bootstrap"></%static:webpack>
<%static:require_module module_name="js/learner_dashboard/unenrollment_factory" class_name="UnenrollmentFactory">
UnenrollmentFactory({
urls: {

4
webpack.common.config.js
View File

@@ -26,7 +26,6 @@ module.exports = {
SingleSupportForm: './lms/static/support/jsx/single_support_form.jsx',
AlertStatusBar: './lms/static/js/accessible_components/StatusBarAlert.jsx',
Bootstrap: './lms/static/common/js/vendor/bootstrap.js',
EntitlementView: './lms/static/js/learner_dashboard/views/course_entitlement_view.js',
// Features
CourseGoals: './openedx/features/course_experience/static/course_experience/js/CourseGoals.js',
@@ -63,7 +62,8 @@ module.exports = {
_: 'underscore',
$: 'jquery',
jQuery: 'jquery',
'window.jQuery': 'jquery'
'window.jQuery': 'jquery',
Popper: ['popper.js', 'default']
}),
// Note: Until karma-webpack releases v3, it doesn't play well with