From 3094b2cf38f596ce9a93dbc6d62587847ac4db14 Mon Sep 17 00:00:00 2001 From: Shamim Rezaie Date: Mon, 17 Jan 2022 21:48:57 +1100 Subject: [PATCH] MDL-73383 atto_collapse: Do not announce the list of added buttons --- lib/editor/atto/plugins/collapse/lang/en/atto_collapse.php | 7 ++++--- lib/editor/atto/plugins/collapse/lib.php | 2 +- .../moodle-atto_collapse-button-debug.js | 6 ++++-- .../moodle-atto_collapse-button/moodle-atto_collapse-button-min.js | 2 +- .../moodle-atto_collapse-button/moodle-atto_collapse-button.js | 6 ++++-- lib/editor/atto/plugins/collapse/yui/src/button/js/button.js | 6 ++++-- 6 files changed, 18 insertions(+), 11 deletions(-) rewrite lib/editor/atto/plugins/collapse/yui/build/moodle-atto_collapse-button/moodle-atto_collapse-button-min.js (91%) diff --git a/lib/editor/atto/plugins/collapse/lang/en/atto_collapse.php b/lib/editor/atto/plugins/collapse/lang/en/atto_collapse.php index ae2650ae5c5..0cda4b16eac 100644 --- 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 index 9788eb1ba16..672b8519a43 100644 --- a/lib/editor/atto/plugins/collapse/lib.php +++ b/lib/editor/atto/plugins/collapse/lib.php @@ -30,7 +30,7 @@ defined('MOODLE_INTERNAL') || die(); 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/lib/editor/atto/plugins/collapse/yui/build/moodle-atto_collapse-button/moodle-atto_collapse-button-debug.js b/lib/editor/atto/plugins/collapse/yui/build/moodle-atto_collapse-button/moodle-atto_collapse-button-debug.js index 9a13089aca9..115d08413fb 100644 --- a/lib/editor/atto/plugins/collapse/yui/build/moodle-atto_collapse-button/moodle-atto_collapse-button-debug.js +++ b/lib/editor/atto/plugins/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('
'), - Y.Node.create('
'), + Y.Node.create('
'), + Y.Node.create('
'), ]; this.toolbar.appendChild(toolbarRows[0]).insert(toolbarRows[1], 'after'); diff --git a/lib/editor/atto/plugins/collapse/yui/build/moodle-atto_collapse-button/moodle-atto_collapse-button-min.js b/lib/editor/atto/plugins/collapse/yui/build/moodle-atto_collapse-button/moodle-atto_collapse-button-min.js dissimilarity index 91% index 76eb86e187c..53cd1406ee2 100644 --- a/lib/editor/atto/plugins/collapse/yui/build/moodle-atto_collapse-button/moodle-atto_collapse-button-min.js +++ b/lib/editor/atto/plugins/collapse/yui/build/moodle-atto_collapse-button/moodle-atto_collapse-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_collapse-button",function(s,t){var o="atto_collapse",a="showgroups",e="collapse",l="collapsed",n=".atto_group",r=".atto_toolbar_row";s.namespace("M.atto_collapse").Button=s.Base.create("button",s.M.editor_atto.EditorPlugin,[],{initializer:function(){var t,i=s.Object.size(this.get("host").get("plugins"));i<=1+parseInt(this.get(a),10)||this.toolbar.all(n).size()>this.get(a)||(t=this.addButton({icon:"icon",iconComponent:o,callback:this._toggle}),this.get("host").on("pluginsloaded",function(t,i){var e,o=[s.Node.create('
'),s.Node.create('
')];this.toolbar.appendChild(o[0]).insert(o[1],"after"),(e=this.toolbar.all(n)).slice(0,this.get(a)).each(function(t){o[0].appendChild(t)}),e.slice(this.get(a)).each(function(t){o[1].appendChild(t)}),this._setVisibility(i),i.setAttribute("aria-expanded","false")},this,t))},_toggle:function(t){t.preventDefault();var i=this.buttons[e];i.getData(l)?(this.highlightButtons(e),this._setVisibility(i,!0),this.toolbar.all(r).item(1).focus()):(this.unHighlightButtons(e),this._setVisibility(i),this.buttons[this.name].focus())},_setVisibility:function(t,i){var e=this.toolbar.all(r).item(1);i?(t.set("title",M.util.get_string("showfewer",o)),e.show(),t.setData(l,!1),t.setAttribute("aria-expanded","true")):(t.set("title",M.util.get_string("showmore",o)),e.hide(),t.setData(l,!0),t.setAttribute("aria-expanded","false")),t.removeAttribute("aria-pressed")}},{ATTRS:{showgroups:{value:3}}})},"@VERSION@",{requires:["moodle-editor_atto-plugin"]}); \ No newline at end of file +YUI.add("moodle-atto_collapse-button",function(s,t){var a="atto_collapse",l="showgroups",i="collapse",o="collapsed",r=".atto_group",n=".atto_toolbar_row";s.namespace("M.atto_collapse").Button=s.Base.create("button",s.M.editor_atto.EditorPlugin,[],{initializer:function(){var t,e=s.Object.size(this.get("host").get("plugins"));e<=1+parseInt(this.get(l),10)||this.toolbar.all(r).size()>this.get(l)||(t=this.addButton({icon:"icon",iconComponent:a,callback:this._toggle}),this.get("host").on("pluginsloaded",function(t,e){var i,o=[s.Node.create('
'),s.Node.create('
')];this.toolbar.appendChild(o[0]).insert(o[1],"after"),(i=this.toolbar.all(r)).slice(0,this.get(l)).each(function(t){o[0].appendChild(t)}),i.slice(this.get(l)).each(function(t){o[1].appendChild(t)}),this._setVisibility(e),e.setAttribute("aria-expanded","false")},this,t))},_toggle:function(t){t.preventDefault();var e=this.buttons[i];e.getData(o)?(this.highlightButtons(i),this._setVisibility(e,!0),this.toolbar.all(n).item(1).focus()):(this.unHighlightButtons(i),this._setVisibility(e),this.buttons[this.name].focus())},_setVisibility:function(t,e){var i=this.toolbar.all(n).item(1);e?(t.set("title",M.util.get_string("showfewer",a)),i.show(),t.setData(o,!1),t.setAttribute("aria-expanded","true")):(t.set("title",M.util.get_string("showmore",a)),i.hide(),t.setData(o,!0),t.setAttribute("aria-expanded","false")),t.removeAttribute("aria-pressed")}},{ATTRS:{showgroups:{value:3}}})},"@VERSION@",{requires:["moodle-editor_atto-plugin"]}); \ No newline at end of file diff --git a/lib/editor/atto/plugins/collapse/yui/build/moodle-atto_collapse-button/moodle-atto_collapse-button.js b/lib/editor/atto/plugins/collapse/yui/build/moodle-atto_collapse-button/moodle-atto_collapse-button.js index fb3768eeffa..cf3f15e41a5 100644 --- a/lib/editor/atto/plugins/collapse/yui/build/moodle-atto_collapse-button/moodle-atto_collapse-button.js +++ b/lib/editor/atto/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('
'), - Y.Node.create('
'), + Y.Node.create('
'), + Y.Node.create('
'), ]; 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 index 661ca2c4e1a..88dfd3b6c94 100644 --- 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('
'), - Y.Node.create('
'), + Y.Node.create('
'), + Y.Node.create('
'), ]; this.toolbar.appendChild(toolbarRows[0]).insert(toolbarRows[1], 'after'); -- 2.11.4.GIT