Skip to content
Browse files

'add a second parameter to enable YUI loading from header.html in the…

… themes - MDL-8374'
  • Loading branch information...
1 parent 537ea84 commit c630701958e19ae7250ef96c168193d3018735b2 urs_hunkler committed
Showing with 20 additions and 9 deletions.
  1. +20 −9 lib/ajax/ajaxlib.php
View
29 lib/ajax/ajaxlib.php
@@ -17,9 +17,11 @@
* @param $lib - string or array of strings
* string(s) should be the shortname for the library or the
* full path to the library file.
+ * $add - 1 to return the libraries in lib
+ * not already loaded.
* @return string or false or nothing.
*/
-function require_js($lib='') {
+function require_js($lib='', $add = 0) {
global $CFG;
static $loadlibs = array();
@@ -30,20 +32,29 @@ function require_js($lib='') {
if (!empty($lib)) {
// Add the lib to the list of libs to be loaded, if it isn't already
// in the list.
- if (is_array($lib)) {
- array_map('require_js', $lib);
- } else {
- $libpath = ajax_get_lib($lib);
+ // if (is_array($lib)) {
+ // array_map('require_js', $lib);
+ // } else {
+ foreach ($lib as $lib1) {
+ // $libpath = ajax_get_lib($lib);
+ $libpath = ajax_get_lib($lib1);
if (array_search($libpath, $loadlibs) === false) {
- array_push($loadlibs, $libpath);
+ // array_push($loadlibs, $libpath);
+ // array_push($addedlibs, $libpath);
+ $loadlibs[] = $libpath;
+ $addedlibs[] = $libpath;
}
}
- } else {
+ }
+ // } else {
+ if (empty($lib) || ((!empty($addedlibs)) && ($add != 0))) {
// Return the html needed to load the JavaScript files defined in
// our list of libs to be loaded.
$output = '';
- foreach ($loadlibs as $loadlib) {
+ $thelibs = (!empty($addedlibs)) ? $addedlibs : $loadlibs;
+ // foreach ($loadlibs as $loadlib) {
+ foreach ($thelibs as $loadlib) {
$output .= '<script type="text/javascript" ';
$output .= " src=\"$loadlib\"></script>\n";
if ($loadlib == $CFG->wwwroot.'/lib/yui/logger/logger-min.js') {
@@ -194,4 +205,4 @@ function print_javascript($courseid, $return=false) {
}
-?>
+?>

0 comments on commit c630701

Please sign in to comment.
Something went wrong with that request. Please try again.