Fix the way jquery and jquery-migrate are loaded

Don't use symlinks to include node_modules
This commit is contained in:
Daniel Friedman
2016-02-27 12:24:09 -05:00
committed by Brian Jacobel
parent 665f983c99
commit 230f252bad
15 changed files with 32 additions and 56 deletions

View File

@@ -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'",
"}",

View File

@@ -3,6 +3,7 @@ define([
'edx-ui-toolkit/js/utils/html-utils',
'domReady!',
'jquery',
'jquery-migrate',
'backbone',
'underscore',
'gettext'

View File

@@ -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',

View File

@@ -1 +0,0 @@
../../../../node_modules/jquery-migrate/dist/jquery-migrate.min.js

View File

@@ -1 +0,0 @@
../../../../node_modules/jquery/dist/jquery.min.js