MDL-73383 atto_collapse: Do not announce the list of added buttons

moodle · Feb 17, 2022 · 3094b2c · 3094b2c
1 parent d24a4ab
commit 3094b2c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/lib/editor/atto/plugins/collapse/lang/en/atto_collapse.php b/lib/editor/atto/plugins/collapse/lang/en/atto_collapse.php
@@ -23,9 +23,10 @@
  */
 
 $string['pluginname'] = 'Show/hide advanced buttons';
-$string['showmore'] = 'Show more buttons';
-$string['showfewer'] = 'Show fewer buttons';
+$string['privacy:metadata'] = 'The atto_collapse plugin does not store any personal data.';
 $string['settings'] = 'Collapse toolbar settings';
+$string['showfewer'] = 'Show fewer buttons';
 $string['showgroups'] = 'Show first (n) groups when collapsed.';
 $string['showgroups_desc'] = 'When the toolbar is collapsed (it is by default) only this many groups will be displayed at once.';
-$string['privacy:metadata'] = 'The atto_collapse plugin does not store any personal data.';
+$string['showmore'] = 'Show more buttons';
+$string['youareonsecondrow'] = 'You are now on another row of the editor\'s toolbar, where there are more buttons.';
diff --git a/lib/editor/atto/plugins/collapse/lib.php b/lib/editor/atto/plugins/collapse/lib.php
@@ -30,7 +30,7 @@
 function atto_collapse_strings_for_js() {
     global $PAGE;
 
-    $PAGE->requires->strings_for_js(array('showmore', 'showfewer'), 'atto_collapse');
+    $PAGE->requires->strings_for_js(array('showmore', 'showfewer', 'youareonsecondrow'), 'atto_collapse');
 }
 
 /**

diff --git a/...ugins/collapse/yui/build/moodle-atto_collapse-button/moodle-atto_collapse-button-debug.js b/...ugins/collapse/yui/build/moodle-atto_collapse-button/moodle-atto_collapse-button-debug.js
@@ -65,8 +65,10 @@ Y.namespace('M.atto_collapse').Button = Y.Base.create('button', Y.M.editor_atto.
         this.get('host').on('pluginsloaded', function(e, button) {
             // Add 2 rows in the toolbar.
             var toolbarRows = [
-                Y.Node.create('<div class="atto_toolbar_row"></div>'),
-                Y.Node.create('<div class="atto_toolbar_row" tabindex="-1"></div>'),
+                Y.Node.create('<div class="atto_toolbar_row" role="group"></div>'),
+                Y.Node.create('<div class="atto_toolbar_row" role="group" aria-label="' +
+                    M.util.get_string('youareonsecondrow', PLUGINNAME) +
+                    '" tabindex="-1"></div>'),
             ];
             this.toolbar.appendChild(toolbarRows[0]).insert(toolbarRows[1], 'after');
 

diff --git a/...plugins/collapse/yui/build/moodle-atto_collapse-button/moodle-atto_collapse-button-min.js b/...plugins/collapse/yui/build/moodle-atto_collapse-button/moodle-atto_collapse-button-min.js
diff --git a/...tto/plugins/collapse/yui/build/moodle-atto_collapse-button/moodle-atto_collapse-button.js b/...tto/plugins/collapse/yui/build/moodle-atto_collapse-button/moodle-atto_collapse-button.js
@@ -61,8 +61,10 @@ Y.namespace('M.atto_collapse').Button = Y.Base.create('button', Y.M.editor_atto.
         this.get('host').on('pluginsloaded', function(e, button) {
             // Add 2 rows in the toolbar.
             var toolbarRows = [
-                Y.Node.create('<div class="atto_toolbar_row"></div>'),
-                Y.Node.create('<div class="atto_toolbar_row" tabindex="-1"></div>'),
+                Y.Node.create('<div class="atto_toolbar_row" role="group"></div>'),
+                Y.Node.create('<div class="atto_toolbar_row" role="group" aria-label="' +
+                    M.util.get_string('youareonsecondrow', PLUGINNAME) +
+                    '" tabindex="-1"></div>'),
             ];
             this.toolbar.appendChild(toolbarRows[0]).insert(toolbarRows[1], 'after');
 

diff --git a/lib/editor/atto/plugins/collapse/yui/src/button/js/button.js b/lib/editor/atto/plugins/collapse/yui/src/button/js/button.js
@@ -63,8 +63,10 @@ Y.namespace('M.atto_collapse').Button = Y.Base.create('button', Y.M.editor_atto.
         this.get('host').on('pluginsloaded', function(e, button) {
             // Add 2 rows in the toolbar.
             var toolbarRows = [
-                Y.Node.create('<div class="atto_toolbar_row"></div>'),
-                Y.Node.create('<div class="atto_toolbar_row" tabindex="-1"></div>'),
+                Y.Node.create('<div class="atto_toolbar_row" role="group"></div>'),
+                Y.Node.create('<div class="atto_toolbar_row" role="group" aria-label="' +
+                    M.util.get_string('youareonsecondrow', PLUGINNAME) +
+                    '" tabindex="-1"></div>'),
             ];
             this.toolbar.appendChild(toolbarRows[0]).insert(toolbarRows[1], 'after');