Fix the way jquery and jquery-migrate are loaded
Don't use symlinks to include node_modules
This commit is contained in:
committed by
Brian Jacobel
parent
665f983c99
commit
230f252bad
@@ -14,7 +14,7 @@ class RequireJSPathOverridesTest(TestCase):
|
||||
"""Test RequireJS path overrides. """
|
||||
|
||||
OVERRIDES = {
|
||||
'jquery': 'js/vendor/jquery.min.js',
|
||||
'jquery': 'common/js/vendor/jquery.js',
|
||||
'backbone': 'common/js/vendor/backbone.js',
|
||||
'text': 'js/vendor/text.js'
|
||||
}
|
||||
@@ -24,7 +24,7 @@ class RequireJSPathOverridesTest(TestCase):
|
||||
"(function (require) {",
|
||||
"require.config({",
|
||||
"paths: {",
|
||||
"'jquery': 'js/vendor/jquery.min',",
|
||||
"'jquery': 'common/js/vendor/jquery',",
|
||||
"'text': 'js/vendor/text',",
|
||||
"'backbone': 'common/js/vendor/backbone'",
|
||||
"}",
|
||||
|
||||
@@ -3,6 +3,7 @@ define([
|
||||
'edx-ui-toolkit/js/utils/html-utils',
|
||||
'domReady!',
|
||||
'jquery',
|
||||
'jquery-migrate',
|
||||
'backbone',
|
||||
'underscore',
|
||||
'gettext'
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
(function(requirejs, define) {
|
||||
'use strict';
|
||||
|
||||
requirejs.config({
|
||||
baseUrl: '/base/',
|
||||
paths: {
|
||||
'gettext': 'js/test/i18n',
|
||||
'jquery': 'js/vendor/jquery.min',
|
||||
'jquery': 'common/js/vendor/jquery',
|
||||
'jquery-migrate': 'common/js/vendor/jquery-migrate',
|
||||
'jquery.ui': 'js/vendor/jquery-ui.min',
|
||||
'jquery.flot': 'js/vendor/flot/jquery.flot.min',
|
||||
'jquery.form': 'js/vendor/jquery.form',
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
../../../../node_modules/jquery-migrate/dist/jquery-migrate.min.js
|
||||
1
common/static/js/vendor/jquery.min.js
vendored
1
common/static/js/vendor/jquery.min.js
vendored
@@ -1 +0,0 @@
|
||||
../../../../node_modules/jquery/dist/jquery.min.js
|
||||
Reference in New Issue
Block a user