MDL-44214 Javascript: Allow for patching of modules in the simpleyui rollup

The moodlesimple (former simpleyui) rollup is included by a slightly
different mechanism to the the other YUI modules and this was missed off
the original yuipatchlevel implementation.
This commit is contained in:
Andrew Nicols 2014-02-17 10:02:10 +08:00
parent 692d247a3a
commit 0f722cfbe5
2 changed files with 8 additions and 2 deletions

View File

@ -1252,8 +1252,13 @@ class page_requirements_manager {
$format = '-debug'; $format = '-debug';
} }
$rollupversion = $CFG->yui3version;
if (!empty($CFG->yuipatchlevel)) {
$rollupversion .= '_' . $CFG->yuipatchlevel;
}
$baserollups = array( $baserollups = array(
'rollup/' . $CFG->yui3version . "/yui-moodlesimple{$yuiformat}.js", 'rollup/' . $rollupversion . "/yui-moodlesimple{$yuiformat}.js",
'rollup/' . $jsrev . "/mcore{$format}.js", 'rollup/' . $jsrev . "/mcore{$format}.js",
); );

View File

@ -83,7 +83,8 @@ while (count($parts)) {
$version = array_shift($bits); $version = array_shift($bits);
if ($version === 'rollup') { if ($version === 'rollup') {
$revision = array_shift($bits); $yuipatchedversion = explode('_', array_shift($bits));
$revision = $yuipatchedversion[0];
$rollupname = array_shift($bits); $rollupname = array_shift($bits);
if (strpos($rollupname, 'yui-moodlesimple') !== false) { if (strpos($rollupname, 'yui-moodlesimple') !== false) {