summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lawrence <dkl@mozilla.com>2017-01-27 15:33:40 +0100
committerDavid Lawrence <dkl@mozilla.com>2017-01-27 15:35:54 +0100
commit2fcef7a5b1aefef32a1a2b524604140e1872b192 (patch)
tree41597fa70c868be7c6b126f5dfedcbc54b3e98f7
parent6cadcc129e33b09346f4b698d548fa8668af228d (diff)
downloadbugzilla-2fcef7a5b1aefef32a1a2b524604140e1872b192.tar.gz
bugzilla-2fcef7a5b1aefef32a1a2b524604140e1872b192.tar.xz
Revert "Bug 1280397 - [a11y] Make the component, product, and other latches accessible"
-rw-r--r--extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl45
-rw-r--r--extensions/BugModal/web/bug_modal.js81
2 files changed, 42 insertions, 84 deletions
diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
index 314db7c3a..d81fb9e92 100644
--- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
@@ -346,12 +346,8 @@
hide_on_edit = can_edit_product
help = "describecomponents.cgi"
%]
- <span aria-hidden="true" class="spin-latch" id="product-latch"
- data-latch="product" data-for="product">&#9656;</span>
- <div role="button" aria-label="show product information"
- title="show product information" tabindex="0"
- aria-expanded="false" class="spin-toggle" id="product-name"
- data-latch="product" data-for="product">
+ <span class="spin-latch" id="product-latch" data-latch="#product-latch" data-for="#product-info">&#9656;</span>
+ <div class="spin-toggle" data-latch="#product-latch" data-for="#product-info">
[% bug.product FILTER html %]
</div>
<div id="product-info" style="display:none">
@@ -388,13 +384,9 @@
field_type = constants.FIELD_TYPE_SINGLE_SELECT
help = "describecomponents.cgi"
%]
- <span aria-hidden="true" class="spin-latch" id="component-latch"
- data-latch="component" data-for="component">&#9656;</span>
- <div role="button" aria-label="show component description"
- title="show component information" tabindex="0"
- aria-expanded="false" class="spin-toggle" id="component-name"
- data-latch="#component-latch" data-for="component">
- [% bug.component FILTER html %]
+ <span class="spin-latch" id="component-latch" data-latch="#component-latch" data-for="#component-info">&#9656;</span>
+ <div class="spin-toggle" data-latch="#component-latch" data-for="#component-info">
+ [% bug.component FILTER html %]
</div>
<div id="component-info" style="display:none">
<div>[% bug.component_obj.description FILTER html_light %]</div>
@@ -683,21 +675,18 @@
[% END %]
[% IF bug.cc && bug.cc.size %]
- <span aria-owns="cc-latch cc-summary">
- [% IF user.id %]
- <input type="hidden" name="removecc" id="removecc">
- <span role="button" aria-label="show cc list" tabindex="0" id="cc-latch">&#9656;</span>
- [% END %]
- <span role="button" aria-label="show cc list" tabindex="0"
- id="cc-summary" data-count="[% bug.cc.size FILTER none %]">
- [%
- IF bug.cc.size == 1;
- is_cced ? "Just you" : "1 person";
- ELSE;
- bug.cc.size _ " people";
- END;
- %]
- </span>
+ [% IF user.id %]
+ <input type="hidden" name="removecc" id="removecc">
+ <span id="cc-latch">&#9656;</span>
+ [% END %]
+ <span id="cc-summary" data-count="[% bug.cc.size FILTER none %]">
+ [%
+ IF bug.cc.size == 1;
+ is_cced ? "Just you" : "1 person";
+ ELSE;
+ bug.cc.size _ " people";
+ END;
+ %]
</span>
[% ELSE %]
<i>Nobody</i>
diff --git a/extensions/BugModal/web/bug_modal.js b/extensions/BugModal/web/bug_modal.js
index 40d3cd6dd..01be1fd2c 100644
--- a/extensions/BugModal/web/bug_modal.js
+++ b/extensions/BugModal/web/bug_modal.js
@@ -163,38 +163,20 @@ $(function() {
// product/component info
$('.spin-toggle, #product-latch, #component-latch')
.click(function(event) {
- spin_toggle(event);
- }).keydown(function(event) {
- // allow space or enter to toggle visibility
- if (event.keyCode == 13 || event.keyCode == 32) {
- spin_toggle(event);
+ event.preventDefault();
+ var latch = $($(event.target).data('latch'));
+ var el_for = $($(event.target).data('for'));
+
+ if (latch.data('expanded')) {
+ latch.data('expanded', false).html('&#9656;');
+ el_for.hide();
+ }
+ else {
+ latch.data('expanded', true).html('&#9662;');
+ el_for.show();
}
});
- function spin_toggle(event) {
- event.preventDefault();
- var type = $(event.target).data('for');
- var latch = $('#' + type + '-latch');
- var name = $('#' + type + '-name');
- var info = $('#' + type + '-info');
- var label = name.attr('aria-label');
-
- if (latch.data('expanded')) {
- label = label.replace(/^hide/, 'show');
- latch.data('expanded', false).html('&#9656;');
- name.attr('aria-expanded', false);
- info.hide();
- }
- else {
- label = label.replace(/^show/, 'hide');
- latch.data('expanded', true).html('&#9662;');
- name.attr('aria-expanded', true);
- info.show();
- }
- name.attr('aria-label', label);
- name.attr('title', label);
- }
-
// cc list
function ccListLoading() {
@@ -248,37 +230,24 @@ $(function() {
$('#cc-summary').addClass('cc-loadable');
$('#cc-latch, #cc-summary')
.click(function(event) {
- cc_toggle(event);
- }).keydown(function(event) {
- // allow space or enter to toggle visibility
- if (event.keyCode == 13 || event.keyCode == 32) {
- cc_toggle(event);
+ event.preventDefault();
+ var latch = $('#cc-latch');
+
+ if (latch.data('expanded')) {
+ latch.data('expanded', false).html('&#9656;');
+ $('#cc-list').hide();
+ }
+ else {
+ latch.data('expanded', true).html('&#9662;');
+ $('#cc-list').show();
+ if (!latch.data('fetched')) {
+ ccListLoading();
+ ccListUpdate();
+ }
}
});
}
- function cc_toggle(event) {
- event.preventDefault();
- var latch = $('#cc-latch');
- var label = latch.attr('aria-label');
- if (latch.data('expanded')) {
- label = label.replace(/^hide/, 'show');
- latch.data('expanded', false).html('&#9656;');
- $('#cc-list').hide();
- }
- else {
- latch.data('expanded', true).html('&#9662;');
- label = label.replace(/^show/, 'hide');
- $('#cc-list').show();
- if (!latch.data('fetched')) {
- ccListLoading();
- ccListUpdate();
- }
- }
- latch.attr('aria-label', label);
- $('#cc-summary').attr('aria-label', label);
- }
-
// copy summary to clipboard
function clipboardSummary() {