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

Merge pull request #16862 from edx/HarryRein/temp-patch-dashboard-entitlements

Browse Source 
Load popper and bootstrap through a script tag to reduce stage flakiness
This commit is contained in:
Harry Rein
2017-12-11 15:16:00 -05:00
committed by GitHub
parent 98456e11a1 a9a255e3c8
commit c734058cd7
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/static/js/learner_dashboard/views/course_entitlement_view.js
View File

@@ -1,11 +1,3 @@
// This is required for karma testing due to a known issue in Bootstrap-v4: https://github.com/twbs/bootstrap/pull/22888
// The issue is that bootstrap tries to access Popper's global Popper object which is not initialized on loading
// from the karma configuration. The next version of bootstrap (>v4.2) will solve this issue.
// Once this is resolved, we should import bootstrap through require-config.js and main.js (for jasmine testing)
var defineFn = require || RequireJS.require; // eslint-disable-line global-require
var Popper = defineFn(['common/js/vendor/popper']);
defineFn(['common/js/vendor/bootstrap']);
(function(define) {
'use strict';

1
lms/static/lms/js/spec/main.js
View File

@@ -762,7 +762,6 @@
'js/spec/learner_dashboard/unenroll_view_spec.js',
'js/spec/learner_dashboard/course_card_view_spec.js',
'js/spec/learner_dashboard/course_enroll_view_spec.js',
'js/spec/learner_dashboard/course_entitlement_view_spec.js',
'js/spec/markdown_editor_spec.js',
'js/spec/dateutil_factory_spec.js',
'js/spec/navigation_spec.js',

4
lms/templates/dashboard.html
View File

@@ -33,6 +33,10 @@ from student.models import CourseEnrollment
<%static:include path="dashboard/${template_name}.underscore" />
</script>
% endfor
% if course_entitlements:
<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">

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

@@ -34,6 +34,10 @@ from student.models import CourseEnrollment
<%static:include path="dashboard/${template_name}.underscore" />
</script>
% endfor
% if course_entitlements:
<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">