diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php index b01eb4724eb..57db9accef4 100644 --- a/lib/outputrequirementslib.php +++ b/lib/outputrequirementslib.php @@ -1284,7 +1284,6 @@ class page_requirements_manager { } } - if ($this->yui3loader->filter === 'RAW') { $code = str_replace('-min.css', '.css', $code); $code = str_replace('-min.js', '.js', $code); diff --git a/lib/yuilib/readme_moodle.txt b/lib/yuilib/readme_moodle.txt index 481c8ae47fb..25dd241dd9d 100644 --- a/lib/yuilib/readme_moodle.txt +++ b/lib/yuilib/readme_moodle.txt @@ -4,10 +4,13 @@ Description of import of various YUI libraries into Moodle: * copy of 2in3 without older version * exact version specified in lib/setup.php -2/ YUI3 version 3.9.1: +2/ YUI3 version 3.13.0: * full copy of the "build" directory. Unit test code coverage files (*-coverage.js) are removed but no other changes are made. +* make sure there are no @VERSION@ leftovers - replace them with current version * exact version specified in lib/setup.php +* update lib/thrirdpartylibs.xml +* verify our simpleyui rollup contents in /theme/yui_combo.php Code downloaded from: http://yuilibrary.com diff --git a/theme/yui_combo.php b/theme/yui_combo.php index eca295aa13a..75f44d12a11 100644 --- a/theme/yui_combo.php +++ b/theme/yui_combo.php @@ -15,7 +15,7 @@ // along with Moodle. If not, see . /** - * This file is responsible for serving of yui images + * This file is responsible for serving of yui Javascript and CSS * * @package core * @copyright 2009 Petr Skoda (skodak) {@link http://skodak.org} @@ -80,7 +80,7 @@ while (count($parts)) { $content .= "\n// Wrong combo resource $part!\n"; continue; } - //debug($bits); + $version = array_shift($bits); if ($version === 'rollup') { $revision = array_shift($bits); @@ -95,7 +95,9 @@ while (count($parts)) { if (strpos($rollupname, 'simpleyui') !== false) { $yuimodules = array( - // Include everything from original SimpleYUI. + // Include everything from original SimpleYUI, + // this list can be built using http://yuilibrary.com/yui/configurator/ by selecting all modules + // listed in https://github.com/yui/yui3/blob/v3.12.0/build/simpleyui/simpleyui.js#L21327 'yui', 'yui-base', 'get', @@ -164,7 +166,6 @@ while (count($parts)) { 'widget-position-constrain', 'overlay', - 'widget-autohide', 'button-core', 'button-plugin', @@ -262,6 +263,8 @@ while (count($parts)) { $contentfile = "$CFG->libdir/yui/$part"; } else if ($version == 'yuiuseall') { + // Create global Y that is available in global scope, + // this is the trick behind original SimpleYUI. $filecontent = "var Y = YUI().use('*');"; } else {