mirror of
https://github.com/moodle/moodle.git
synced 2025-01-18 05:58:34 +01:00
Fixed some JS issues for IE. MDL-8183.
This commit is contained in:
parent
38f169e25a
commit
95bea1edfa
@ -16,7 +16,7 @@ require_once($CFG->libdir.'/json/JSON.php');
|
||||
|
||||
$success = true;
|
||||
|
||||
$courseid = required_param('id', PARAM_INT);
|
||||
$courseid = required_param('id', PARAM_INT);
|
||||
$groupingid = optional_param('grouping', -1, PARAM_INT);
|
||||
$groupid = optional_param('group', false, PARAM_INT);
|
||||
$userid = optional_param('user', false, PARAM_INT);
|
||||
@ -186,8 +186,8 @@ if ($success) {
|
||||
</td>
|
||||
<td>
|
||||
<p><label for="groups" id="groupslabel"><?php print_string('groupsinselectedgrouping', 'group'); ?></label></p>
|
||||
<select name="group" id="groups" size="15" class="select">
|
||||
<?php //onchange="onGroupChange()"
|
||||
<select name="group" id="groups" size="15" class="select" onchange="membersCombo.refreshMembers(this.options[this.selectedIndex].value);">
|
||||
<?php
|
||||
if (GROUP_NOT_IN_GROUPING == $sel_groupingid) {
|
||||
$groupids = groups_get_groups_not_in_any_grouping($courseid); //$sel_groupingid
|
||||
} else {
|
||||
|
@ -14,8 +14,8 @@ function UpdatableGroupsCombo(wwwRoot, courseId) {
|
||||
this.courseId = courseId;
|
||||
|
||||
this.connectCallback = {
|
||||
success: function(o) {
|
||||
|
||||
success: function(o) {
|
||||
if (o.responseText !== undefined) {
|
||||
var groupsComboEl = document.getElementById("groups");
|
||||
var membersComboEl = document.getElementById("members");
|
||||
@ -28,8 +28,7 @@ function UpdatableGroupsCombo(wwwRoot, courseId) {
|
||||
}
|
||||
|
||||
if (groupsComboEl && o.responseText) {
|
||||
//var groups = eval("("+o.responseText+")");
|
||||
var groups = eval(o.responseText);
|
||||
var groups = eval("("+o.responseText+")");
|
||||
|
||||
// Populate the groups combo box.
|
||||
for (var i=0; i<groups.length; i++) {
|
||||
@ -46,14 +45,22 @@ function UpdatableGroupsCombo(wwwRoot, courseId) {
|
||||
|
||||
failure: function(o) {
|
||||
removeLoaderImgs("membersloader", "memberslabel");
|
||||
this.currentTransId = null;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
// Add onchange event to groups combo box.
|
||||
// Okay, this is not working in IE. The onchange is never fired...
|
||||
// I'm hard coding the onchange in ../index.php. Not ideal, but it works
|
||||
// then. vyshane AT moodle DOT com.
|
||||
/*
|
||||
groupsComboEl = document.getElementById("groups");
|
||||
if (groupsComboEl) {
|
||||
groupsComboEl.setAttribute("onchange", "membersCombo.refreshMembers(this.options[this.selectedIndex].value);");
|
||||
}
|
||||
*/
|
||||
|
||||
// Hide the updategroups input since AJAX will take care of this.
|
||||
var updateGroupsButton = document.getElementById("updategroups");
|
||||
updateGroupsButton.setAttribute("style", "display:none;");
|
||||
@ -94,7 +101,7 @@ function UpdatableMembersCombo(wwwRoot, courseId) {
|
||||
var selectEl = document.getElementById("members");
|
||||
|
||||
if (selectEl && o.responseText) {
|
||||
var members = eval('('+o.responseText+')');
|
||||
var members = eval("("+o.responseText+")");
|
||||
|
||||
// Populate the members combo box.
|
||||
for (var i=0; i<members.length; i++) {
|
||||
@ -112,6 +119,7 @@ function UpdatableMembersCombo(wwwRoot, courseId) {
|
||||
failure: function(o) {
|
||||
removeLoaderImgs("membersloader", "memberslabel");
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
// Hide the updatemembers input since AJAX will take care of this.
|
||||
@ -145,9 +153,8 @@ var createLoaderImg = function (elClass, parentId, wwwRoot) {
|
||||
if (!parentEl) {
|
||||
return false;
|
||||
}
|
||||
var loaders = YAHOO.util.Dom.getElementsByClassName(elClass, "img", parentEl);
|
||||
if (loaders.length > 0) {
|
||||
// A loader image exists already.
|
||||
if (document.getElementById("loaderImg")) {
|
||||
// A loader image already exists.
|
||||
return false;
|
||||
}
|
||||
var loadingImg = document.createElement("img");
|
||||
@ -155,6 +162,7 @@ var createLoaderImg = function (elClass, parentId, wwwRoot) {
|
||||
loadingImg.setAttribute("src", wwwRoot+"/pix/i/ajaxloader.gif");
|
||||
loadingImg.setAttribute("class", elClass);
|
||||
loadingImg.setAttribute("alt", "Loading");
|
||||
loadingImg.setAttribute("id", "loaderImg");
|
||||
parentEl.appendChild(loadingImg);
|
||||
|
||||
return true;
|
||||
@ -163,11 +171,8 @@ var createLoaderImg = function (elClass, parentId, wwwRoot) {
|
||||
|
||||
var removeLoaderImgs = function (elClass, parentId) {
|
||||
var parentEl = document.getElementById(parentId);
|
||||
|
||||
if (parentEl) {
|
||||
var loaders = YAHOO.util.Dom.getElementsByClassName(elClass, "img", parentEl);
|
||||
for (var i=0; i<loaders.length; i++) {
|
||||
parentEl.removeChild(loaders[i]);
|
||||
}
|
||||
var loader = document.getElementById("loaderImg");
|
||||
parentEl.removeChild(loader);
|
||||
}
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user