Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix Chrome issue #54

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix Chrome issue #54

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd05925
fix: ttDownloadables no height prop cause exception
ro1963855 Feb 18, 2022
cba8df8
fix: prevent observer node don't have querySelector cause exception
ro1963855 Feb 18, 2022
b604705
fix: change get default audio language way
ro1963855 Feb 18, 2022
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
12 changes: 7 additions & 5 deletions src/nflxmultisubs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,9 @@ class SubtitleFactory {
}

static _buildImageBased(track, lang, bcp47) {
const maxHeight = Math.max(...Object.values(track.ttDownloadables).map(d => d.height));
const d = Object.values(track.ttDownloadables).find(d => d.height === maxHeight);
const maxHeight = Math.max(...Object.values(track.ttDownloadables)
.map(d => Number.isInteger(d.height) ? d.height : 0));
const d = Object.values(track.ttDownloadables).find(d => maxHeight === 0 || d.height === maxHeight);
const urls = Object.values(d.downloadUrls);
return new ImageSubtitle(lang, bcp47, urls);
}
Expand Down Expand Up @@ -464,7 +465,7 @@ const bodyObserver = new MutationObserver(mutations => {
mutations.forEach(mutation => {
mutation.addedNodes.forEach(node => {
// FIXME: performance hazard
const subtitleMenuElem = node.querySelector('div[data-uia="selector-audio-subtitle"]');
const subtitleMenuElem = node && node.querySelector && node.querySelector('div[data-uia="selector-audio-subtitle"]');
if (subtitleMenuElem) {
// popup menu attached
if (!subtitleMenuElem.getElementsByClassName(SUBTITLE_LIST_CLASSNAME).length) {
Expand Down Expand Up @@ -1070,8 +1071,9 @@ class NflxMultiSubsManager {
defaultAudioId = manifest.recommendedMedia.audioTrackId;
defaultAudioTrack = manifest.audio_tracks.find(t => t.new_track_id == defaultAudioId);
}
console.log(`Default audio track language: ${defaultAudioLanguage}`);
const autoSubtitleId = gSubtitles.findIndex(t => t.bcp47 == defaultAudioLanguage);

console.log(`Default audio track language: ${defaultAudioTrack.language}`);
const autoSubtitleId = gSubtitles.findIndex(t => t.bcp47 == defaultAudioTrack.language);
if (autoSubtitleId >= 0) {
console.log(`Subtitle #${autoSubtitleId} auto-enabled to match audio`);
activateSubtitle(autoSubtitleId);
Expand Down