diff --git a/common/lib/xmodule/xmodule/js/src/conditional/display.js b/common/lib/xmodule/xmodule/js/src/conditional/display.js index 09da8b32f4..8bfda99007 100644 --- a/common/lib/xmodule/xmodule/js/src/conditional/display.js +++ b/common/lib/xmodule/xmodule/js/src/conditional/display.js @@ -152,9 +152,8 @@ eval.call(window, data); console.log("JavaScript text resource eval'd", resource); } else if (kind === 'url') { - // This is a dependency loaded from the LMS (not ideal) - return ViewUtils.loadJavaScript(data).done(function() { - console.log('JavaScript url resource loaded', resource); + $script(data, data, function () { + console.log('JavaScript url resource loaded', resource); }); } } else if (mimetype === 'text/html') { diff --git a/webpack.common.config.js b/webpack.common.config.js index 5ad625f5eb..e4602d30e5 100644 --- a/webpack.common.config.js +++ b/webpack.common.config.js @@ -106,7 +106,10 @@ module.exports = Merge.smart({ Popper: 'popper.js', // used by bootstrap CodeMirror: 'codemirror', 'edx.HtmlUtils': 'edx-ui-toolkit/js/utils/html-utils', - AjaxPrefix: 'ajax_prefix' + AjaxPrefix: 'ajax_prefix', + // This is used by some XModules/XBlocks, which don't have + // any other way to declare that dependency. + $script: 'scriptjs' }), // Note: Until karma-webpack releases v3, it doesn't play well with