MDL-21887 fixed borked JS, but still the groups ajax needs a major cleanup

diff --git a/group/clientlib.js b/group/clientlib.js
index 4dfd815..deb0431 100644 (file)
--- a/group/clientlib.js
+++ b/group/clientlib.js
@@ -19,7 +19,6 @@ function UpdatableGroupsCombo(wwwRoot, courseId) {
             if (o.responseText !== undefined) {
                 var groupsComboEl = document.getElementById("groups");
                 var membersComboEl = document.getElementById("members");
-
                 if (membersComboEl) {
                     // Clear the members list box.
                     while (membersComboEl.firstChild) {

diff --git a/group/index.php b/group/index.php
index 4532589..ce5e16b 100644 (file)
--- a/group/index.php
+++ b/group/index.php
@@ -11,8 +11,6 @@
 require_once('../config.php');
 require_once('lib.php');
 
-ini_set('include_path', $CFG->libdir.'/pear'.PATH_SEPARATOR.ini_get('include_path'));
-
 $PAGE->requires->yui2_lib('connection');
 $PAGE->requires->js('/group/clientlib.js');
 
@@ -172,8 +170,8 @@ echo '<tr>'."\n";
 echo "<td>\n";
 echo '<p><label for="groups"><span id="groupslabel">'.get_string('groups').':</span><span id="thegrouping">&nbsp;</span></label></p>'."\n";
 
-if (ajaxenabled()) {
-    $onchange = 'membersCombo.refreshMembers();';
+if (ajaxenabled()) { // TODO: move this to JS init!
+    $onchange = 'M.core_group.membersCombo.refreshMembers();';
 } else {
     $onchange = '';
 }
@@ -263,10 +261,7 @@ echo '</div>'."\n";
 echo '</form>'."\n";
 
 if (ajaxenabled()) {
-    $PAGE->requires->js_function_call('var groupsCombo = new UpdatableGroupsCombo',
-            array($CFG->httpswwwroot, $course->id));
-    $PAGE->requires->js_function_call('var membersCombo = new UpdatableMembersCombo',
-            array($CFG->httpswwwroot, $course->id));
+    $PAGE->requires->js_init_call('M.core_group.init_index');
 }
 
 echo $OUTPUT->footer();

diff --git a/group/module.js b/group/module.js
index 3f42a04..de5bb49 100644 (file)
--- a/group/module.js
+++ b/group/module.js
@@ -40,3 +40,7 @@ M.core_group.init_hover_events = function(Y, events) {
     }
 }
 
+M.core_group.init_index = function(Y) {
+    M.core_group.groupsCombo = new UpdatableGroupsCombo();
+    M.core_group.membersCombo = new UpdatableMembersCombo;
+}
\ No newline at end of file