Skip to content

Commit cc7072f

Browse files
committed
Bug fix: screenreader rereading whole page. Improve a11y eqn preview
IM-871, IM-872
1 parent bcbee9d commit cc7072f

File tree

16 files changed

+71
-23
lines changed

16 files changed

+71
-23
lines changed

assess2/index.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// IMathAS: Main launch page for assess2 assessment player
33
// (c) 2019 David Lippman
44

5-
$lastupdate = '20200521';
5+
$lastupdate = '20200525';
66

77
require('../init.php');
88
if (empty($_GET['cid']) || empty($_GET['aid'])) {
@@ -36,7 +36,7 @@
3636
$placeinhead .= '<link rel="stylesheet" type="text/css" href="'.$imasroot.'/assess2/vue/css/chunk-common.css?v='.$lastupdate.'" />';
3737
$placeinhead .= '<link rel="stylesheet" type="text/css" href="'.$imasroot.'/assess2/print.css?v='.$lastupdate.'" media="print">';
3838
$placeinhead .= '<script src="'.$imasroot.'/mathquill/mathquill.min.js?v=022720" type="text/javascript"></script>';
39-
$placeinhead .= '<script src="'.$imasroot.'/javascript/assess2_min.js?v=052120" type="text/javascript"></script>';
39+
$placeinhead .= '<script src="'.$imasroot.'/javascript/assess2_min.js?v=052520" type="text/javascript"></script>';
4040
$placeinhead .= '<link rel="stylesheet" type="text/css" href="'.$imasroot.'/mathquill/mathquill-basic.css">
4141
<link rel="stylesheet" type="text/css" href="'.$imasroot.'/mathquill/mqeditor.css">';
4242
if ($isltilimited || $inTreeReader) {

assess2/vue-src/public/index.html

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,16 @@
1010
<script type="text/javascript">
1111
var noMathRender = false; var usingASCIIMath = true; var AMnoMathML = true;
1212
var MathJaxCompatible = true; var mathRenderer="MathJax";
13-
function rendermathnode(node) { MathJax.Hub.Queue(["Typeset", MathJax.Hub, node]); }
13+
function rendermathnode(node,callback) {
14+
if (window.MathJax) {
15+
MathJax.Hub.Queue(["Typeset", MathJax.Hub, node]);
16+
if (typeof callback == "function") {
17+
MathJax.Hub.Queue(callback);
18+
}
19+
} else {
20+
setTimeout(function() {rendermathnode(node, callback);}, 100);
21+
}
22+
}
1423
var imasroot = 'http://localhost/imathas';
1524
var APIbase = 'http://localhost/imathas/assess2/';
1625
var coursetheme = "https://ohm.lumenlearning.com/themes/lumen.css?v=110918";

assess2/vue-src/src/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div id="app" role="main" aria-live="polite">
2+
<div id="app" role="main">
33
<div v-if="!assessInfoLoaded">
44
{{ $t('loading') }}
55
</div>

assess2/vue-src/src/basicstore.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,7 @@ export const actions = {
506506
var el;
507507
if (!hasSeqNext) {
508508
el = document.getElementById('questionwrap' + qns[0]).parentNode.parentNode;
509+
window.$(el).find('.scoreresult').focus();
509510
} else {
510511
el = window.$('#questionwrap' + qns[0]).find('.seqsep').last().next()[0];
511512
}

assess2/vue-src/src/components/question/QuestionHelps.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</li>
66
<li v-for="(qHelp,idx) in qHelps" :key="idx">
77
<a href="#" @click.prevent="loadHelp(qHelp)">
8-
<icons :name="qHelp.icon" />
8+
<icons :name="qHelp.icon" alt=""/>
99
{{ qHelp.title }}
1010
</a>
1111
</li>

assess2/vue-src/src/components/question/ScoreResult.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<transition name="fade">
33
<div
44
:class="['scoreresult', status]"
5+
tabindex = "-1"
56
v-if="expanded"
67
>
78
<p v-if="showScores">
@@ -24,9 +25,8 @@
2425
v-if = "showNext"
2526
:to="'/skip/' + (this.qn + 2)"
2627
tag="button"
27-
:aria-label="$t('next')"
2828
>
29-
<icons name="right" />
29+
<icons name="right" alt=""/>
3030
{{ $t('scoreresult.next') }}
3131
</router-link>
3232
<button
@@ -42,7 +42,7 @@
4242
type = "button"
4343
@click = "trySimilar"
4444
>
45-
<icons name="retake" />
45+
<icons name="retake" alt="" />
4646
{{ $t('scoreresult.trysimilar') }}
4747
</button>
4848
<span v-if = "qdata.canretry">

assess2/vue-src/src/components/widgets/Icons.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ export default {
157157
props: ['name', 'size', 'color', 'alt'],
158158
computed: {
159159
alttext () {
160-
if (this.alt) {
160+
if (this.alt || this.alt === '') {
161161
if (this.alt === '') {
162162
return '';
163163
} else {

assess2/vue/js/chunk-common.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assess2/vue/js/chunk-common.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assess2/vue/js/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)