Unverified Commit c864de7c by Harry Rein Committed by GitHub

Merge pull request #16878 from edx/HarryRein/entitlements-requireJS-loading-issue

Harry rein/entitlements require js loading issue
parents badb1f84 19406fa4
......@@ -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: [
......
......@@ -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']
},
......
......@@ -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'
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment