diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js index 5a74a2d6a1..8519782a26 100644 --- a/apps/common/main/lib/component/Button.js +++ b/apps/common/main/lib/component/Button.js @@ -658,6 +658,14 @@ define([ } }); } + + if (me.enableToggle && !me.menu) { + $('button', el).attr('aria-pressed', !!me.pressed) + } + + if (me.menu) { + $('[data-toggle^=dropdown]', el).attr('aria-haspopup', 'menu'); + } } me.rendered = true; @@ -691,8 +699,10 @@ define([ this.pressed = state; - if (this.cmpEl) + if (this.cmpEl) { + this.cmpEl.attr('aria-pressed', state); this.cmpEl.trigger('button.internal.active', [state]); + } if (!suppressEvent) this.trigger('toggle', this, state); diff --git a/apps/documenteditor/main/app/template/StatusBar.template b/apps/documenteditor/main/app/template/StatusBar.template index cea4290bab..b17b727d11 100644 --- a/apps/documenteditor/main/app/template/StatusBar.template +++ b/apps/documenteditor/main/app/template/StatusBar.template @@ -27,10 +27,10 @@
- - + + -
+