Merge pull request #11813 from edx/andya/upgrade-requirejs

Upgrade RequireJS
This commit is contained in:
Andy Armstrong
2016-03-16 14:24:27 -04:00
12 changed files with 11 additions and 46 deletions

View File

@@ -28,7 +28,7 @@ prepend_path: cms/static
# Paths to library JavaScript files (optional)
lib_paths:
- xmodule_js/common_static/js/vendor/require.js
- xmodule_js/common_static/js/vendor/requirejs/require.js
- xmodule_js/common_static/coffee/src/ajax_prefix.js
- xmodule_js/common_static/js/src/utility.js
- xmodule_js/common_static/js/vendor/jquery.min.js

View File

@@ -28,7 +28,7 @@ prepend_path: cms/static
# Paths to library JavaScript files (optional)
lib_paths:
- xmodule_js/common_static/js/vendor/require.js
- xmodule_js/common_static/js/vendor/requirejs/require.js
- xmodule_js/common_static/coffee/src/ajax_prefix.js
- xmodule_js/common_static/js/src/utility.js
- xmodule_js/common_static/js/vendor/jquery.min.js