Skip to content

Commit 51a35c0

Browse files
terrillterrill
committed
Fix validation errors, including those in auto-transcript generator
1 parent 39c8b95 commit 51a35c0

12 files changed

Lines changed: 177 additions & 117 deletions

‎build/ableplayer.dist.js‎

Lines changed: 54 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3738,7 +3738,7 @@
37383738
// user preferences (???)
37393739
// some controls are aligned on the left, and others on the right
37403740
var useSpeedButtons, useFullScreen,
3741-
i, j, k, controls, controllerSpan, tooltipId, tooltipX, tooltipY, control,
3741+
i, j, k, controls, $controllerSpan, tooltipId, tooltipX, tooltipY, control,
37423742
buttonImg, buttonImgSrc, buttonTitle, newButton, iconClass, buttonIcon, buttonUse,
37433743
leftWidth, rightWidth, totalWidth, leftWidthStyle, rightWidthStyle,
37443744
controllerStyles, vidcapStyles, captionLabel, popupMenuId;
@@ -3764,21 +3764,21 @@
37643764
for (i = 0; i <= 3; i++) {
37653765
controls = controlLayout[sectionByOrder[i]];
37663766
if ((i % 2) === 0) {
3767-
controllerSpan = $('<span>',{
3767+
$controllerSpan = $('<div>',{
37683768
'class': 'able-left-controls'
37693769
});
37703770
}
37713771
else {
3772-
controllerSpan = $('<span>',{
3772+
$controllerSpan = $('<div>',{
37733773
'class': 'able-right-controls'
37743774
});
37753775
}
3776-
this.$controllerDiv.append(controllerSpan);
3776+
this.$controllerDiv.append($controllerSpan);
37773777
for (j=0; j<controls.length; j++) {
37783778
control = controls[j];
37793779
if (control === 'seek') {
37803780
var sliderDiv = $('<div class="able-seekbar"></div>');
3781-
controllerSpan.append(sliderDiv);
3781+
$controllerSpan.append(sliderDiv);
37823782
this.seekBar = new AccessibleSeekBar(sliderDiv, baseSliderWidth);
37833783
}
37843784
else if (control === 'pipe') {
@@ -3798,7 +3798,7 @@
37983798
});
37993799
pipe.append(pipeImg);
38003800
}
3801-
controllerSpan.append(pipe);
3801+
$controllerSpan.append(pipe);
38023802
}
38033803
else {
38043804
// this control is a button
@@ -4011,7 +4011,7 @@
40114011
}
40124012
}
40134013

4014-
controllerSpan.append(newButton);
4014+
$controllerSpan.append(newButton);
40154015

40164016
// create variables of buttons that are referenced throughout the AblePlayer object
40174017
if (control === 'play') {
@@ -4056,7 +4056,7 @@
40564056
}
40574057
if (control === 'volume') {
40584058
// in addition to the volume button, add a hidden slider
4059-
this.addVolumeSlider(controllerSpan);
4059+
this.addVolumeSlider($controllerSpan);
40604060
}
40614061
}
40624062
if ((i % 2) == 1) {
@@ -5280,7 +5280,7 @@
52805280
this.seekHead.attr('tabindex', '0');
52815281
// Since head is focusable, it gets the aria roles/titles.
52825282
this.seekHead.attr('role', 'slider');
5283-
this.seekHead.attr('aria-value-min', 0);
5283+
this.seekHead.attr('aria-valuemin', 0);
52845284

52855285
this.timeTooltip = $('<div>');
52865286
this.bodyDiv.append(this.timeTooltip);
@@ -5454,7 +5454,7 @@
54545454
if (duration !== this.duration) {
54555455
this.duration = duration;
54565456
this.resetHeadLocation();
5457-
this.seekHead.attr('aria-value-max', duration);
5457+
this.seekHead.attr('aria-valuemax', duration);
54585458
}
54595459
};
54605460

@@ -5577,7 +5577,7 @@
55775577
}
55785578

55795579
/* Uncomment to use aria values instead of separate live region.
5580-
this.seekHead.attr('aria-value-text', descriptionText);
5580+
this.seekHead.attr('aria-valuetext', descriptionText);
55815581
this.seekHead.attr('aria-valuenow', Math.floor(position).toString());*/
55825582
};
55835583

@@ -5680,8 +5680,8 @@
56805680
'class': 'able-volume-head',
56815681
'role': 'slider',
56825682
'aria-label': this.tt.volumeUpDown,
5683-
'aria-value-min': 0,
5684-
'aria-value-max': 10,
5683+
'aria-valuemin': 0,
5684+
'aria-valuemax': 10,
56855685
'tabindex': 0 /* should be -1, then change to 0 dynamically & place focus when visible */
56865686
});
56875687
this.$volumeSliderTrack.append(this.$volumeSliderTrackOn,this.$volumeSliderHead);
@@ -7100,8 +7100,8 @@
71007100
widthUsed = 0;
71017101
seekbarSpacer = 40; // adjust for discrepancies in browsers' calculated button widths
71027102

7103-
leftControls = this.seekBar.wrapperDiv.parent().prev('span.able-left-controls');
7104-
rightControls = leftControls.next('span.able-right-controls');
7103+
leftControls = this.seekBar.wrapperDiv.parent().prev('div.able-left-controls');
7104+
rightControls = leftControls.next('div.able-right-controls');
71057105
leftControls.children().each(function () {
71067106
if ($(this).prop('tagName')=='BUTTON') {
71077107
widthUsed += $(this).width();
@@ -9053,7 +9053,14 @@
90539053
};
90549054

90559055
var addDescription = function(div, desc) {
9056-
var descDiv = $('<div class="able-desc"><span class="able-hidden">Description: </span></div>');
9056+
var $descDiv = $('<div>', {
9057+
'class': 'able-desc'
9058+
});
9059+
var $descHiddenSpan = $('<span>',{
9060+
'class': 'able-hidden'
9061+
});
9062+
$descHiddenSpan.text('Description: ');
9063+
$descDiv.append($descHiddenSpan);
90579064

90589065
var flattenComponentForDescription = function(comp) {
90599066
var result = [];
@@ -9068,23 +9075,27 @@
90689075
return result;
90699076
}
90709077

9071-
var descSpan = $('<span class="able-transcript-seekpoint"></span>');
9078+
var $descSpan = $('<span>',{
9079+
'class': 'able-transcript-seekpoint'
9080+
});
90729081
for (var ii in desc.components.children) {
90739082
var results = flattenComponentForDescription(desc.components.children[ii]);
90749083
for (var jj in results) {
9075-
descSpan.append(results[jj]);
9084+
$descSpan.append(results[jj]);
90769085
}
90779086
}
9078-
descSpan.attr('data-start', desc.start.toString());
9079-
descSpan.attr('data-end', desc.end.toString());
9080-
descDiv.append(descSpan);
9087+
$descSpan.attr('data-start', desc.start.toString());
9088+
$descSpan.attr('data-end', desc.end.toString());
9089+
$descDiv.append($descSpan);
90819090

9082-
div.append(descDiv);
9091+
div.append($descDiv);
90839092
};
90849093

90859094
var addCaption = function(div, cap) {
90869095

9087-
var capSpan = $('<span class="able-transcript-seekpoint able-transcript-caption"></span>');
9096+
var $capSpan = $('<span>',{
9097+
'class': 'able-transcript-seekpoint able-transcript-caption'
9098+
});
90889099

90899100
var flattenComponentForCaption = function(comp) {
90909101

@@ -9106,12 +9117,20 @@
91069117

91079118
if ((hasParens && hasBrackets && openBracket < openParen) || hasBrackets) {
91089119
result = result.concat(flattenString(str.substring(0, openBracket)));
9109-
result.push($('<div></div><span class="able-unspoken">' + str.substring(openBracket, closeBracket + 1) + '</span>'));
9110-
result = result.concat(flattenString(str.substring(closeBracket + 1)));
9120+
var $silentSpan = $('<span>',{
9121+
'class': 'able-unspoken'
9122+
});
9123+
$silentSpan.text(str.substring(openBracket, closeBracket + 1));
9124+
result.push($silentSpan);
9125+
result = result.concat(flattenString(str.substring(openParen, closeParen + 1)));
91119126
}
91129127
else if (hasParens) {
91139128
result = result.concat(flattenString(str.substring(0, openParen)));
9114-
result.push($('<div></div><span class="able-unspoken">' + str.substring(openParen, closeParen + 1) + '</span>'));
9129+
var $silentSpan = $('<span>',{
9130+
'class': 'able-unspoken'
9131+
});
9132+
$silentSpan.text(str.substring(openBracket, closeBracket + 1));
9133+
result.push($silentSpan);
91159134
result = result.concat(flattenString(str.substring(closeParen + 1)));
91169135
}
91179136
else {
@@ -9124,8 +9143,11 @@
91249143
result = result.concat(flattenString(comp.value));
91259144
}
91269145
else if (comp.type === 'v') {
9127-
var vSpan = $('<div></div><span class="able-unspoken">[' + comp.value + ']</span>');
9128-
result.push(vSpan);
9146+
var $vSpan = $('<span>',{
9147+
'class': 'able-unspoken'
9148+
});
9149+
$vSpan.text('[ ' + comp.value + ' ]');
9150+
result.push($vSpan);
91299151
for (var ii in comp.children) {
91309152
var subResults = flattenComponentForCaption(comp.children[ii]);
91319153
for (var jj in subResults) {
@@ -9166,12 +9188,12 @@
91669188
// add <br> BETWEEN each caption and WITHIN each caption (if payload includes "\n")
91679189
result = result.replace('\n','<br>') + '<br>';
91689190
}
9169-
capSpan.append(result);
9191+
$capSpan.append(result);
91709192
}
91719193
}
9172-
capSpan.attr('data-start', cap.start.toString());
9173-
capSpan.attr('data-end', cap.end.toString());
9174-
div.append(capSpan);
9194+
$capSpan.attr('data-start', cap.start.toString());
9195+
$capSpan.attr('data-end', cap.end.toString());
9196+
div.append($capSpan);
91759197
div.append('\n');
91769198
};
91779199

0 commit comments

Comments
 (0)