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
c864de7c
Unverified
Commit
c864de7c
authored
Dec 12, 2017
by
Harry Rein
Committed by
GitHub
Dec 12, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #16878 from edx/HarryRein/entitlements-requireJS-loading-issue
Harry rein/entitlements require js loading issue
parents
badb1f84
19406fa4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
19 deletions
+0
-19
lms/static/lms/js/require-config.js
+0
-9
lms/static/lms/js/spec/main.js
+0
-6
webpack.common.config.js
+0
-4
No files found.
lms/static/lms/js/require-config.js
View file @
c864de7c
...
...
@@ -100,8 +100,6 @@
'string_utils'
:
'js/src/string_utils'
,
'utility'
:
'js/src/utility'
,
'draggabilly'
:
'js/vendor/draggabilly'
,
'popper'
:
'common/js/vendor/popper'
,
'bootstrap'
:
'common/js/vendor/bootstrap'
,
// Files needed by OVA
'annotator'
:
'js/vendor/ova/annotator-full'
,
...
...
@@ -208,13 +206,6 @@
'grouping-annotator'
:
{
deps
:
[
'annotator'
]
},
'popper'
:
{
exports
:
'Popper'
},
'bootstrap'
:
{
deps
:
[
'jquery'
,
'popper'
],
exports
:
'bootstrap'
},
'ova'
:
{
exports
:
'ova'
,
deps
:
[
...
...
lms/static/lms/js/spec/main.js
View file @
c864de7c
...
...
@@ -46,8 +46,6 @@
'backbone.associations'
:
'xmodule_js/common_static/js/vendor/backbone-associations-min'
,
'backbone.paginator'
:
'common/js/vendor/backbone.paginator'
,
'backbone-super'
:
'js/vendor/backbone-super'
,
'popper'
:
'common/js/vendor/popper'
,
'bootstrap'
:
'common/js/vendor/bootstrap'
,
'URI'
:
'xmodule_js/common_static/js/vendor/URI.min'
,
'tinymce'
:
'xmodule_js/common_static/js/vendor/tinymce/js/tinymce/tinymce.full.min'
,
'jquery.tinymce'
:
'xmodule_js/common_static/js/vendor/tinymce/js/tinymce/jquery.tinymce'
,
...
...
@@ -199,10 +197,6 @@
'backbone-super'
:
{
deps
:
[
'backbone'
]
},
'bootstrap'
:
{
deps
:
[
'jquery'
,
'popper'
],
exports
:
'bootstrap'
},
'paging-collection'
:
{
deps
:
[
'jquery'
,
'underscore'
,
'backbone.paginator'
]
},
...
...
webpack.common.config.js
View file @
c864de7c
...
...
@@ -65,9 +65,6 @@ module.exports = {
jQuery
:
'jquery'
,
'window.jQuery'
:
'jquery'
}),
new
webpack
.
ProvidePlugin
({
Popper
:
'popper.js'
}),
// Note: Until karma-webpack releases v3, it doesn't play well with
// the CommonsChunkPlugin. We have a kludge in karma.common.conf.js
...
...
@@ -174,7 +171,6 @@ module.exports = {
gettext
:
'gettext'
,
jquery
:
'jQuery'
,
logger
:
'Logger'
,
popper
:
'Popper'
,
underscore
:
'_'
,
URI
:
'URI'
},
...
...
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