Skip to content

Commit

Permalink
fix(FEC-7345): only off option appears in text track menu (safari) (#148
Browse files Browse the repository at this point in the history
)
  • Loading branch information
yairans authored and OrenMe committed Oct 26, 2017
1 parent 4447c1d commit cff8e4e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/engines/html5/media-source/adapters/native-adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,9 @@ export default class NativeAdapter extends BaseMediaSourceAdapter {
language: textTracks[i].language,
index: i
};
parsedTracks.push(new PKTextTrack(settings));
if (settings.language || settings.label) {
parsedTracks.push(new PKTextTrack(settings));
}
}
}
return parsedTracks;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,16 +238,19 @@ describe('NativeAdapter: _getParsedTracks', function () {
let video;
let track1;
let track2;
let track3;
let nativeInstance;

before(() => {
track1 = document.createElement("track");
track2 = document.createElement("track");
track3 = document.createElement("track");
track1.kind = 'subtitles';
track1.label = 'English';
track1.default = true;
track2.kind = 'captions';
track2.srclang = 'fr';
track3.kind = 'captions';
});

beforeEach(() => {
Expand Down Expand Up @@ -298,6 +301,17 @@ describe('NativeAdapter: _getParsedTracks', function () {
});
});

it('should not return parsed of text track without language or label', (done) => {
video.appendChild(track1);
video.appendChild(track2);
video.appendChild(track3);
nativeInstance.load().then((data) => {
video.textTracks.length.should.equal(3);
data.tracks.filter((track) => track instanceof TextTrack).length.should.be.equal(2);
done();
});
});

it('should return only progressive video tracks before loading', () => {
let tracks = nativeInstance._getParsedTracks();
tracks.length.should.be.equal(2);
Expand Down

0 comments on commit cff8e4e

Please sign in to comment.