Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
a9a255e3
Commit
a9a255e3
authored
Dec 11, 2017
by
Harry Rein
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Load popper and bootstrap through a script tag to reduce flakiness on stage.
parent
25eb3187
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
9 deletions
+8
-9
lms/static/js/learner_dashboard/views/course_entitlement_view.js
+0
-8
lms/static/lms/js/spec/main.js
+0
-1
lms/templates/dashboard.html
+4
-0
themes/edx.org/lms/templates/dashboard.html
+4
-0
No files found.
lms/static/js/learner_dashboard/views/course_entitlement_view.js
View file @
a9a255e3
// 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'
;
...
...
lms/static/lms/js/spec/main.js
View file @
a9a255e3
...
...
@@ -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'
,
...
...
lms/templates/dashboard.html
View file @
a9a255e3
...
...
@@ -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"
>
...
...
themes/edx.org/lms/templates/dashboard.html
View file @
a9a255e3
...
...
@@ -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"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment