Merge branch 'wip-mdl-32150-m21' of git://github.com/rajeshtaneja/moodle into MOODLE_21_STABLE

This commit is contained in:
Sam Hemelryk
2012-04-03 10:32:33 +12:00
3 changed files with 13 additions and 2 deletions
+5 -1
View File
@@ -100,7 +100,11 @@ YUI.add('moodle-form-checkboxcontroller', function(Y) {
controllervaluenode.set('value', '1');
newvalue = 'checked';
}
checkboxes.set('checked', newvalue);
checkboxes.each(function(checkbox){
if (!checkbox.get('disabled')) {
checkbox.set('checked', newvalue);
}
});
}
}
});
+2 -1
View File
@@ -1066,7 +1066,8 @@ abstract class moodleform {
if (!is_null($contollerbutton) || is_null($select_value)) {
foreach ($mform->_elements as $element) {
if (($element instanceof MoodleQuickForm_advcheckbox) &&
$element->getAttribute('class') == $checkboxgroupclass) {
$element->getAttribute('class') == $checkboxgroupclass &&
!$element->isFrozen()) {
$mform->setConstants(array($element->getName() => $new_select_value));
}
}
+6
View File
@@ -796,6 +796,9 @@ function checkall() {
var inputs = document.getElementsByTagName('input');
for (var i = 0; i < inputs.length; i++) {
if (inputs[i].type == 'checkbox') {
if (inputs[i].disabled || inputs[i].readOnly) {
continue;
}
inputs[i].checked = true;
}
}
@@ -805,6 +808,9 @@ function checknone() {
var inputs = document.getElementsByTagName('input');
for (var i = 0; i < inputs.length; i++) {
if (inputs[i].type == 'checkbox') {
if (inputs[i].disabled || inputs[i].readOnly) {
continue;
}
inputs[i].checked = false;
}
}