Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch jquery's extend

Browse Source
This commit is contained in:
noraiz-anwar
2019-09-11 19:48:51 +05:00
committed by Noraiz Anwar
parent 73a89a876e
commit a596579e62
4 changed files with 92 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cms/static/cms/js/require-config.js
View File

@@ -134,6 +134,7 @@
'draggabilly': 'js/vendor/draggabilly',
'hls': 'common/js/vendor/hls',
'lang_edx': 'js/src/lang_edx',
'jquery_extend_patch': 'js/src/jquery_extend_patch',
// externally hosted files
mathjax: 'https://cdn.jsdelivr.net/npm/mathjax@2.7.5/MathJax.js?config=TeX-MML-AM_HTMLorMML&delayStartupUntil=configured', // eslint-disable-line max-len
@@ -345,8 +346,13 @@
'rangeslider', 'share-annotator', 'richText-annotator', 'reply-annotator',
'tags-annotator', 'flagging-annotator', 'grouping-annotator', 'diacritic-annotator',
'openseadragon', 'jquery-Watch', 'catch', 'handlebars', 'URI']
}
},
// end of annotation tool files
// patch for jquery's extend
'jquery_extend_patch': {
deps: ['jquery']
}
}
});
}).call(this, require, define);

2
cms/static/js/factories/base.js
View File

@@ -1,7 +1,7 @@
// We can't convert this to an es6 module until all factories that use it have been converted out
// of RequireJS
define(['js/base', 'cms/js/main', 'js/src/logger', 'datepair', 'accessibility',
'ieshim', 'tooltip_manager', 'lang_edx', 'js/models/course'],
'ieshim', 'tooltip_manager', 'lang_edx', 'js/models/course', 'jquery_extend_patch'],
function() {
'use strict';
}