Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ function toggleCheckboxSelection(element)
<!--<td class="representative newPrecursor <%=precursor.getNewPrecursorId()%>"><%=precursor.getNewPrecursorId()%></td>-->
<td class="representative details-control newPrecursor <%=precursor.getNewPrecursorId()%>">
<span class="<%=precursor.getNewPrecursorId()%>_<%=precursor.getOldPrecursorId()%>">
<img src="<%=getWebappURL("_images/plus.gif")%>"/>
<img src="<%=getWebappURL("_images/plus.gif")%>" alt="Expand row details"/>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should flip when we swap the plus for a minus on lines 122 and 127.

</span>
</td>
<td class="representative newPrecursor <%=precursor.getNewPrecursorId()%>">
Expand All @@ -291,7 +291,7 @@ function toggleCheckboxSelection(element)
<!--<td class="oldPrecursor <%=precursor.getNewPrecursorId()%>"><%=precursor.getOldPrecursorId()%></td>-->
<td class="details-control oldPrecursor <%=precursor.getNewPrecursorId()%>">
<span class="<%=precursor.getNewPrecursorId()%>_<%=precursor.getOldPrecursorId()%>">
<img src="<%=getWebappURL("_images/plus.gif")%>"/>
<img src="<%=getWebappURL("_images/plus.gif")%>" alt="Expand row details"/>
</span>
</td>
<td class="oldPrecursor <%=precursor.getNewPrecursorId()%>">
Expand Down
24 changes: 12 additions & 12 deletions webapp/TargetedMS/js/QCTrendPlotPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -1008,8 +1008,8 @@ Ext4.define('LABKEY.targetedms.QCTrendPlotPanel', {
columns: 2,
vertical: false,
items: [
{ boxLabel: 'per replicate', id: 'x-axis-grouping-replicate', name: 'xAxisGrouping', inputValue: 'replicate', checked: this.groupedX === false },
{ boxLabel: 'per date', id: 'x-axis-grouping-date', name: 'xAxisGrouping', inputValue: 'date', checked: this.groupedX === true }
{ boxLabel: 'per replicate', id: 'x-axis-grouping-replicate', name: 'xAxisGrouping', inputValue: 'replicate', checked: this.groupedX === false, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'X-axis grouping: per replicate'}); } } },
{ boxLabel: 'per date', id: 'x-axis-grouping-date', name: 'xAxisGrouping', inputValue: 'date', checked: this.groupedX === true, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'X-axis grouping: per date'}); } } }
],
listeners: {
scope: this,
Expand Down Expand Up @@ -1038,8 +1038,8 @@ Ext4.define('LABKEY.targetedms.QCTrendPlotPanel', {
columns: 2,
vertical: false,
items: [
{ boxLabel: 'per precursor', name: 'showPlots', id: 'plots-per-precursor', inputValue: 'per-precursor', checked: this.singlePlot === false },
{ boxLabel: 'combined', name: 'showPlots', id: 'plots-combined', inputValue: 'combined', checked: this.singlePlot === true }
{ boxLabel: 'per precursor', name: 'showPlots', id: 'plots-per-precursor', inputValue: 'per-precursor', checked: this.singlePlot === false, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'Plots: per precursor'}); } } },
{ boxLabel: 'combined', name: 'showPlots', id: 'plots-combined', inputValue: 'combined', checked: this.singlePlot === true, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'Plots: combined'}); } } }
],
listeners: {
scope: this,
Expand Down Expand Up @@ -1069,8 +1069,8 @@ Ext4.define('LABKEY.targetedms.QCTrendPlotPanel', {
columns: 2,
vertical: false,
items: [
{ boxLabel: 'show', id: 'excluded-replicates-show', name: 'excludedSamples', inputValue: 'show', checked: this.showExcluded === true },
{ boxLabel: 'hide', id: 'excluded-replicates-hide', name: 'excludedSamples', inputValue: 'hide', checked: this.showExcluded === false }
{ boxLabel: 'show', id: 'excluded-replicates-show', name: 'excludedSamples', inputValue: 'show', checked: this.showExcluded === true, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'Excluded replicates: show'}); } } },
{ boxLabel: 'hide', id: 'excluded-replicates-hide', name: 'excludedSamples', inputValue: 'hide', checked: this.showExcluded === false, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'Excluded replicates: hide'}); } } }
],
listeners: {
scope: this,
Expand Down Expand Up @@ -1098,8 +1098,8 @@ Ext4.define('LABKEY.targetedms.QCTrendPlotPanel', {
columns: 2,
vertical: false,
items: [
{ boxLabel: 'show', id: 'excluded-precursors-show', name: 'excludedPrecursors', inputValue: 'show', checked: this.showExcludedPrecursors === true },
{ boxLabel: 'hide', id: 'excluded-precursors-hide', name: 'excludedPrecursors', inputValue: 'hide', checked: this.showExcludedPrecursors === false }
{ boxLabel: 'show', id: 'excluded-precursors-show', name: 'excludedPrecursors', inputValue: 'show', checked: this.showExcludedPrecursors === true, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'Excluded precursors: show'}); } } },
{ boxLabel: 'hide', id: 'excluded-precursors-hide', name: 'excludedPrecursors', inputValue: 'hide', checked: this.showExcludedPrecursors === false, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'Excluded precursors: hide'}); } } }
],
listeners: {
scope: this,
Expand Down Expand Up @@ -1132,8 +1132,8 @@ Ext4.define('LABKEY.targetedms.QCTrendPlotPanel', {
columns: 2,
vertical: false,
items: [
{ boxLabel: 'always show', id: 'reference-guide-set-show', name: 'referenceGuideSets', inputValue: 'show', checked: this.showReferenceGS === true },
{ boxLabel: 'when in date range', id: 'reference-guide-set-hide', name: 'referenceGuideSets', inputValue: 'hide', checked: this.showReferenceGS === false }
{ boxLabel: 'always show', id: 'reference-guide-set-show', name: 'referenceGuideSets', inputValue: 'show', checked: this.showReferenceGS === true, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'Reference guide sets: always show'}); } } },
{ boxLabel: 'when in date range', id: 'reference-guide-set-hide', name: 'referenceGuideSets', inputValue: 'hide', checked: this.showReferenceGS === false, listeners: { afterrender: function(r) { r.inputEl.set({'aria-label': 'Reference guide sets: when in date range'}); } } }
],
listeners: {
scope: this,
Expand Down Expand Up @@ -1272,10 +1272,10 @@ Ext4.define('LABKEY.targetedms.QCTrendPlotPanel', {
var btnHtml = '';

btnHtml += '<span class="qc-paging-prev ' + (this.pagingStartIndex > 0 ? 'qc-paging-icon-enabled' : 'qc-paging-icon-disabled')
+ '"><i class="fa fa-angle-left"></i></span>';
+ '" role="button" aria-label="Previous page"><i class="fa fa-angle-left" aria-hidden="true"></i></span>';
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't keyboard focusable by default. It's probably best to switch these to , which would let us drop the role="button" and would mean that we wouldn't need to toggle an aria-disabled attribute when the control is disabled.


btnHtml += '<span class="qc-paging-next ' + (this.pagingEndIndex < numOfPrecursors ? 'qc-paging-icon-enabled' : 'qc-paging-icon-disabled')
+ '"><i class="fa fa-angle-right"></i></span>';
+ '" role="button" aria-label="Next page"><i class="fa fa-angle-right" aria-hidden="true"></i></span>';

return btnHtml;
},
Expand Down
Loading