Skip to content

Commit 587aa16

Browse files
terrillterrill
committed
Tweak search to work better in a client-side search application
1 parent fde38e0 commit 587aa16

6 files changed

Lines changed: 33 additions & 24 deletions

File tree

‎build/ableplayer.dist.js‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -429,12 +429,15 @@ var AblePlayerInstances = [];
429429
}
430430

431431
// Search
432-
if ($(media).data('search') !== undefined && $(media).data('search') !== "") {
433-
// conducting a search currently requires an external div in which to write the results
434-
if ($(media).data('search-div') !== undefined && $(media).data('search-div') !== "") {
432+
// conducting a search requires an external div in which to write the results
433+
if ($(media).data('search-div') !== undefined && $(media).data('search-div') !== "") {
434+
435+
this.searchDiv = $(media).data('search-div');
436+
437+
// Search term (optional; could be assigned later in a JavaScript application)
438+
if ($(media).data('search') !== undefined && $(media).data('search') !== "") {
435439
this.searchString = $(media).data('search');
436-
this.searchDiv = $(media).data('search-div');
437-
}
440+
}
438441

439442
// Search Language
440443
if ($(media).data('search-lang') !== undefined && $(media).data('search-lang') !== "") {
@@ -11347,11 +11350,11 @@ if (thisObj.useTtml && (trackSrc.endsWith('.xml') || trackText.startsWith('<?xml
1134711350
$resultsItem.append(itemStartSpan, itemText);
1134811351
$resultsList.append($resultsItem);
1134911352
}
11350-
$('#' + this.searchDiv).append(searchStringHtml,$resultsSummary,$resultsList);
11353+
$('#' + this.searchDiv).html(searchStringHtml).append($resultsSummary,$resultsList);
1135111354
}
1135211355
else {
1135311356
var noResults = $('<p>').text(this.tt.noResultsFound);
11354-
$('#' + this.searchDiv).append(noResults);
11357+
$('#' + this.searchDiv).html(searchStringHtml).append(noResults);
1135511358
}
1135611359
}
1135711360
}

‎build/ableplayer.js‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -429,12 +429,15 @@ var AblePlayerInstances = [];
429429
}
430430

431431
// Search
432-
if ($(media).data('search') !== undefined && $(media).data('search') !== "") {
433-
// conducting a search currently requires an external div in which to write the results
434-
if ($(media).data('search-div') !== undefined && $(media).data('search-div') !== "") {
432+
// conducting a search requires an external div in which to write the results
433+
if ($(media).data('search-div') !== undefined && $(media).data('search-div') !== "") {
434+
435+
this.searchDiv = $(media).data('search-div');
436+
437+
// Search term (optional; could be assigned later in a JavaScript application)
438+
if ($(media).data('search') !== undefined && $(media).data('search') !== "") {
435439
this.searchString = $(media).data('search');
436-
this.searchDiv = $(media).data('search-div');
437-
}
440+
}
438441

439442
// Search Language
440443
if ($(media).data('search-lang') !== undefined && $(media).data('search-lang') !== "") {
@@ -11347,11 +11350,11 @@ if (thisObj.useTtml && (trackSrc.endsWith('.xml') || trackText.startsWith('<?xml
1134711350
$resultsItem.append(itemStartSpan, itemText);
1134811351
$resultsList.append($resultsItem);
1134911352
}
11350-
$('#' + this.searchDiv).append(searchStringHtml,$resultsSummary,$resultsList);
11353+
$('#' + this.searchDiv).html(searchStringHtml).append($resultsSummary,$resultsList);
1135111354
}
1135211355
else {
1135311356
var noResults = $('<p>').text(this.tt.noResultsFound);
11354-
$('#' + this.searchDiv).append(noResults);
11357+
$('#' + this.searchDiv).html(searchStringHtml).append(noResults);
1135511358
}
1135611359
}
1135711360
}

‎build/ableplayer.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ableplayer",
3-
"version": "4.3.1",
3+
"version": "4.3.2",
44
"description": "fully accessible HTML5 media player",
55
"homepage": "http://ableplayer.github.io/ableplayer",
66
"bugs": "https://github.com/ableplayer/ableplayer/issues",

‎scripts/ableplayer-base.js‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -429,12 +429,15 @@ var AblePlayerInstances = [];
429429
}
430430

431431
// Search
432-
if ($(media).data('search') !== undefined && $(media).data('search') !== "") {
433-
// conducting a search currently requires an external div in which to write the results
434-
if ($(media).data('search-div') !== undefined && $(media).data('search-div') !== "") {
432+
// conducting a search requires an external div in which to write the results
433+
if ($(media).data('search-div') !== undefined && $(media).data('search-div') !== "") {
434+
435+
this.searchDiv = $(media).data('search-div');
436+
437+
// Search term (optional; could be assigned later in a JavaScript application)
438+
if ($(media).data('search') !== undefined && $(media).data('search') !== "") {
435439
this.searchString = $(media).data('search');
436-
this.searchDiv = $(media).data('search-div');
437-
}
440+
}
438441

439442
// Search Language
440443
if ($(media).data('search-lang') !== undefined && $(media).data('search-lang') !== "") {

‎scripts/search.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@
5858
$resultsItem.append(itemStartSpan, itemText);
5959
$resultsList.append($resultsItem);
6060
}
61-
$('#' + this.searchDiv).append(searchStringHtml,$resultsSummary,$resultsList);
61+
$('#' + this.searchDiv).html(searchStringHtml).append($resultsSummary,$resultsList);
6262
}
6363
else {
6464
var noResults = $('<p>').text(this.tt.noResultsFound);
65-
$('#' + this.searchDiv).append(noResults);
65+
$('#' + this.searchDiv).html(searchStringHtml).append(noResults);
6666
}
6767
}
6868
}

0 commit comments

Comments
 (0)