mirror of
https://github.com/moodle/moodle.git
synced 2025-08-09 10:56:56 +02:00
Merge branch 'MDL-80259-main' of https://github.com/roland04/moodle
This commit is contained in:
commit
8b36abdb9d
93 changed files with 218 additions and 209 deletions
|
@ -436,7 +436,7 @@ M.core_availability.List = function(json, root, parentRoot) {
|
|||
noneNode.appendChild(deleteIcon.span);
|
||||
|
||||
// Also if it's not the root, none is actually invalid, so add a label.
|
||||
noneNode.appendChild(Y.Node.create('<span class="mt-1 badge badge-warning">' +
|
||||
noneNode.appendChild(Y.Node.create('<span class="mt-1 badge bg-warning text-dark">' +
|
||||
M.util.get_string('invalid', 'availability') + '</span>'));
|
||||
}
|
||||
|
||||
|
@ -1002,7 +1002,7 @@ M.core_availability.Item = function(json, root) {
|
|||
|
||||
// Add the invalid marker (empty).
|
||||
this.node.appendChild(document.createTextNode(' '));
|
||||
this.node.appendChild(Y.Node.create('<span class="badge badge-warning"/>'));
|
||||
this.node.appendChild(Y.Node.create('<span class="badge bg-warning text-dark"/>'));
|
||||
};
|
||||
Y.augment(M.core_availability.Item, Y.EventTarget, true, null, {emitFacade: true});
|
||||
|
||||
|
@ -1039,7 +1039,7 @@ M.core_availability.Item.prototype.fillErrors = function(errors) {
|
|||
errors.push('core_availability:item_unknowntype');
|
||||
}
|
||||
// If any errors were added, add the marker to this item.
|
||||
var errorLabel = this.node.one('> .badge-warning');
|
||||
var errorLabel = this.node.one('> .bg-warning');
|
||||
if (errors.length !== before && !errorLabel.get('firstChild')) {
|
||||
var errorString = '';
|
||||
// Fetch the last error code from the array of errors and split using the ':' delimiter.
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -436,7 +436,7 @@ M.core_availability.List = function(json, root, parentRoot) {
|
|||
noneNode.appendChild(deleteIcon.span);
|
||||
|
||||
// Also if it's not the root, none is actually invalid, so add a label.
|
||||
noneNode.appendChild(Y.Node.create('<span class="mt-1 badge badge-warning">' +
|
||||
noneNode.appendChild(Y.Node.create('<span class="mt-1 badge bg-warning text-dark">' +
|
||||
M.util.get_string('invalid', 'availability') + '</span>'));
|
||||
}
|
||||
|
||||
|
@ -1002,7 +1002,7 @@ M.core_availability.Item = function(json, root) {
|
|||
|
||||
// Add the invalid marker (empty).
|
||||
this.node.appendChild(document.createTextNode(' '));
|
||||
this.node.appendChild(Y.Node.create('<span class="badge badge-warning"/>'));
|
||||
this.node.appendChild(Y.Node.create('<span class="badge bg-warning text-dark"/>'));
|
||||
};
|
||||
Y.augment(M.core_availability.Item, Y.EventTarget, true, null, {emitFacade: true});
|
||||
|
||||
|
@ -1039,7 +1039,7 @@ M.core_availability.Item.prototype.fillErrors = function(errors) {
|
|||
errors.push('core_availability:item_unknowntype');
|
||||
}
|
||||
// If any errors were added, add the marker to this item.
|
||||
var errorLabel = this.node.one('> .badge-warning');
|
||||
var errorLabel = this.node.one('> .bg-warning');
|
||||
if (errors.length !== before && !errorLabel.get('firstChild')) {
|
||||
var errorString = '';
|
||||
// Fetch the last error code from the array of errors and split using the ':' delimiter.
|
||||
|
|
6
availability/yui/src/form/js/form.js
vendored
6
availability/yui/src/form/js/form.js
vendored
|
@ -434,7 +434,7 @@ M.core_availability.List = function(json, root, parentRoot) {
|
|||
noneNode.appendChild(deleteIcon.span);
|
||||
|
||||
// Also if it's not the root, none is actually invalid, so add a label.
|
||||
noneNode.appendChild(Y.Node.create('<span class="mt-1 badge badge-warning">' +
|
||||
noneNode.appendChild(Y.Node.create('<span class="mt-1 badge bg-warning text-dark">' +
|
||||
M.util.get_string('invalid', 'availability') + '</span>'));
|
||||
}
|
||||
|
||||
|
@ -1000,7 +1000,7 @@ M.core_availability.Item = function(json, root) {
|
|||
|
||||
// Add the invalid marker (empty).
|
||||
this.node.appendChild(document.createTextNode(' '));
|
||||
this.node.appendChild(Y.Node.create('<span class="badge badge-warning"/>'));
|
||||
this.node.appendChild(Y.Node.create('<span class="badge bg-warning text-dark"/>'));
|
||||
};
|
||||
Y.augment(M.core_availability.Item, Y.EventTarget, true, null, {emitFacade: true});
|
||||
|
||||
|
@ -1037,7 +1037,7 @@ M.core_availability.Item.prototype.fillErrors = function(errors) {
|
|||
errors.push('core_availability:item_unknowntype');
|
||||
}
|
||||
// If any errors were added, add the marker to this item.
|
||||
var errorLabel = this.node.one('> .badge-warning');
|
||||
var errorLabel = this.node.one('> .bg-warning');
|
||||
if (errors.length !== before && !errorLabel.get('firstChild')) {
|
||||
var errorString = '';
|
||||
// Fetch the last error code from the array of errors and split using the ':' delimiter.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue