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
791b8b14
Commit
791b8b14
authored
Dec 12, 2017
by
Harry Rein
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Importing bootstrap and popper through webpack.
parent
19406fa4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
16 deletions
+5
-16
lms/templates/dashboard.html
+1
-5
lms/templates/learner_dashboard/program_details_fragment.html
+1
-4
themes/edx.org/lms/templates/dashboard.html
+1
-5
webpack.common.config.js
+2
-2
No files found.
lms/templates/dashboard.html
View file @
791b8b14
...
...
@@ -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: {
...
...
lms/templates/learner_dashboard/program_details_fragment.html
View file @
791b8b14
...
...
@@ -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},
...
...
themes/edx.org/lms/templates/dashboard.html
View file @
791b8b14
...
...
@@ -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: {
...
...
webpack.common.config.js
View file @
791b8b14
...
...
@@ -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
...
...
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