From 5b7fbdb938a9abdad2014178d0a4e92b5df855ab Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 10 Feb 2014 15:44:19 +0800
Subject: [PATCH 1/2] MDL-43504 Javascript: Frontpage collapsing should not
 depend on enableajax

This is an oversight, but we should not depend on the enableajax setting
which we're trying to deprecate.
---
 course/renderer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/course/renderer.php b/course/renderer.php
index 1a6c7fdc611..b1dbd507d58 100644
--- a/course/renderer.php
+++ b/course/renderer.php
@@ -1383,7 +1383,7 @@ class core_course_renderer extends plugin_renderer_base {
     protected function coursecat_include_js() {
         global $CFG;
         static $jsloaded = false;
-        if (!$jsloaded && $CFG->enableajax) {
+        if (!$jsloaded) {
             // We must only load this module once.
             $this->page->requires->yui_module('moodle-course-categoryexpander',
                     'Y.Moodle.course.categoryexpander.init');

From 51b833de3e6ee052df6d487141e56cf3571e23f5 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 17 Feb 2014 11:33:50 +0800
Subject: [PATCH 2/2] MDL-43504 Course: Include the course/category collapse JS
 correctly

This was previously only included when there were hidden categories to show
which were not yet visible. As a result, if all categories were visible,
then the JS was not included.
---
 course/renderer.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/course/renderer.php b/course/renderer.php
index b1dbd507d58..5569d1c4778 100644
--- a/course/renderer.php
+++ b/course/renderer.php
@@ -1463,8 +1463,6 @@ class core_course_renderer extends plugin_renderer_base {
                 $classes[] = 'with_children';
                 $classes[] = 'collapsed';
             }
-            // Make sure JS file to expand category content is included.
-            $this->coursecat_include_js();
         } else {
             // load category content
             $categorycontent = $this->coursecat_category_content($chelper, $coursecat, $depth);
@@ -1474,6 +1472,10 @@ class core_course_renderer extends plugin_renderer_base {
                 $classes[] = 'expanded';
             }
         }
+
+        // Make sure JS file to expand category content is included.
+        $this->coursecat_include_js();
+
         $content = html_writer::start_tag('div', array(
             'class' => join(' ', $classes),
             'data-categoryid' => $coursecat->id,