Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge branch 'wip-MDL-60284-master' of git://github.com/abgreeve/moodle
- Loading branch information
Showing
with
10 additions
and
7 deletions.
-
+7
−4
lib/requirejs/require.js
-
+2
−2
lib/requirejs/require.min.js
-
+1
−1
lib/thirdpartylibs.xml
|
|
@@ -1,5 +1,5 @@ |
|
|
/** vim: et:ts=4:sw=4:sts=4 |
|
|
* @license RequireJS 2.3.2 Copyright jQuery Foundation and other contributors. |
|
|
* @license RequireJS 2.3.5 Copyright jQuery Foundation and other contributors. |
|
|
* Released under MIT license, https://github.com/requirejs/requirejs/blob/master/LICENSE |
|
|
*/ |
|
|
//Not using strict: uneven strict support in browsers, #392, and causes |
|
@@ -11,7 +11,7 @@ var requirejs, require, define; |
|
|
(function (global, setTimeout) { |
|
|
var req, s, head, baseElement, dataMain, src, |
|
|
interactiveScript, currentlyAddingScript, mainScript, subPath, |
|
|
version = '2.3.2', |
|
|
version = '2.3.5', |
|
|
commentRegExp = /\/\*[\s\S]*?\*\/|([^:"'=]|^)\/\/.*$/mg, |
|
|
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g, |
|
|
jsSuffixRegExp = /\.js$/, |
|
@@ -440,7 +440,9 @@ var requirejs, require, define; |
|
|
//Account for relative paths if there is a base name. |
|
|
if (name) { |
|
|
if (prefix) { |
|
|
if (pluginModule && pluginModule.normalize) { |
|
|
if (isNormalized) { |
|
|
normalizedName = name; |
|
|
} else if (pluginModule && pluginModule.normalize) { |
|
|
//Plugin is loaded, use its normalize method. |
|
|
normalizedName = pluginModule.normalize(name, function (name) { |
|
|
return normalize(name, parentName, applyMap); |
|
@@ -972,7 +974,8 @@ var requirejs, require, define; |
|
|
//prefix and name should already be normalized, no need |
|
|
//for applying map config again either. |
|
|
normalizedMap = makeModuleMap(map.prefix + '!' + name, |
|
|
this.map.parentMap); |
|
|
this.map.parentMap, |
|
|
true); |
|
|
on(normalizedMap, |
|
|
'defined', bind(this, function (value) { |
|
|
this.map.normalizedMap = normalizedMap; |
|
|
Oops, something went wrong.