mirror of
https://github.com/moodle/moodle.git
synced 2025-03-25 01:50:55 +01:00
Merge branch 'MDL-72078-master' of git://github.com/rezaies/moodle
This commit is contained in:
commit
295cd6dd7c
@ -33,6 +33,7 @@ $string['errorpluginnotfound'] = 'The plugin \'{$a}\' cannot be used; it does no
|
||||
$string['errorpluginisusedtwice'] = 'The plugin \'{$a}\' is used twice; plugins can only be defined once.';
|
||||
$string['errortextrecovery'] = 'Unfortunately the draft version could not be restored.';
|
||||
$string['pluginname'] = 'Atto HTML editor';
|
||||
$string['richtexteditor'] = 'Rich text editor';
|
||||
$string['subplugintype_atto'] = 'Atto plugin';
|
||||
$string['subplugintype_atto_plural'] = 'Atto plugins';
|
||||
$string['settings'] = 'Atto toolbar settings';
|
||||
|
@ -140,15 +140,16 @@ class atto_texteditor extends texteditor {
|
||||
$jsplugins[] = array('group'=>$group, 'plugins'=>$groupplugins);
|
||||
}
|
||||
|
||||
$PAGE->requires->strings_for_js(array(
|
||||
$PAGE->requires->strings_for_js([
|
||||
'editor_command_keycode',
|
||||
'editor_control_keycode',
|
||||
'plugin_title_shortcut',
|
||||
'textrecovered',
|
||||
'autosavefailed',
|
||||
'autosavesucceeded',
|
||||
'errortextrecovery'
|
||||
), 'editor_atto');
|
||||
'errortextrecovery',
|
||||
'richtexteditor',
|
||||
], 'editor_atto');
|
||||
$PAGE->requires->strings_for_js(array(
|
||||
'warning',
|
||||
'info'
|
||||
|
@ -184,7 +184,10 @@ Y.extend(Editor, Y.Base, {
|
||||
|
||||
this._eventHandles = [];
|
||||
|
||||
this._wrapper = Y.Node.create('<div class="' + CSS.WRAPPER + '" />');
|
||||
var description = Y.Node.create('<div class="sr-only">' + M.util.get_string('richtexteditor', 'editor_atto') + '</div>');
|
||||
this._wrapper = Y.Node.create('<div class="' + CSS.WRAPPER + '" role="application" />');
|
||||
this._wrapper.appendChild(description);
|
||||
this._wrapper.setAttribute('aria-describedby', description.generateID());
|
||||
template = Y.Handlebars.compile('<div id="{{elementid}}editable" ' +
|
||||
'contenteditable="true" ' +
|
||||
'role="textbox" ' +
|
||||
|
File diff suppressed because one or more lines are too long
@ -182,7 +182,10 @@ Y.extend(Editor, Y.Base, {
|
||||
|
||||
this._eventHandles = [];
|
||||
|
||||
this._wrapper = Y.Node.create('<div class="' + CSS.WRAPPER + '" />');
|
||||
var description = Y.Node.create('<div class="sr-only">' + M.util.get_string('richtexteditor', 'editor_atto') + '</div>');
|
||||
this._wrapper = Y.Node.create('<div class="' + CSS.WRAPPER + '" role="application" />');
|
||||
this._wrapper.appendChild(description);
|
||||
this._wrapper.setAttribute('aria-describedby', description.generateID());
|
||||
template = Y.Handlebars.compile('<div id="{{elementid}}editable" ' +
|
||||
'contenteditable="true" ' +
|
||||
'role="textbox" ' +
|
||||
|
5
lib/editor/atto/yui/src/editor/js/editor.js
vendored
5
lib/editor/atto/yui/src/editor/js/editor.js
vendored
@ -182,7 +182,10 @@ Y.extend(Editor, Y.Base, {
|
||||
|
||||
this._eventHandles = [];
|
||||
|
||||
this._wrapper = Y.Node.create('<div class="' + CSS.WRAPPER + '" />');
|
||||
var description = Y.Node.create('<div class="sr-only">' + M.util.get_string('richtexteditor', 'editor_atto') + '</div>');
|
||||
this._wrapper = Y.Node.create('<div class="' + CSS.WRAPPER + '" role="application" />');
|
||||
this._wrapper.appendChild(description);
|
||||
this._wrapper.setAttribute('aria-describedby', description.generateID());
|
||||
template = Y.Handlebars.compile('<div id="{{elementid}}editable" ' +
|
||||
'contenteditable="true" ' +
|
||||
'role="textbox" ' +
|
||||
|
Loading…
x
Reference in New Issue
Block a user