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

Jump to bottom

VideoPlayer.tsx: Don't newline subtitles. (Help yomitan get the entire subtitle) #474

Merged
merged 6 commits into from
Aug 11, 2024
Merged

VideoPlayer.tsx: Don't newline subtitles. (Help yomitan get the entire subtitle) #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
06ad9da
VideoPlayer.tsx: Don't newline subtitles. (Let yomitan pick up the fu…
Viterkim Jul 25, 2024
2b3a53e
Videoplayer.tsx: Also wrap text with <p> when dom caching is disabled
Viterkim Aug 10, 2024
988a604
video-player.css: Fix excessive gap on bottom of subtitles (visible w…
Viterkim Aug 11, 2024
95f111b
undo inline: messed with splits on subs, whiteSpace made a huge box u…
Viterkim Aug 11, 2024
40490d5
videoplayer.tsx: lineheight: normal -> inherit, better spacing look
Viterkim Aug 11, 2024
9071d5b
prettier
Viterkim Aug 11, 2024
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
15 changes: 11 additions & 4 deletions common/app/components/VideoPlayer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ const useStyles = makeStyles({
paddingLeft: 20,
paddingRight: 20,
textAlign: 'center',
whiteSpace: 'pre-wrap',
lineHeight: 'normal',
whiteSpace: 'normal',
lineHeight: 'inherit',
},
});

Expand Down Expand Up @@ -165,7 +165,9 @@ const showingSubtitleHtml = (
`;
}

return `<span style="${subtitleStyles}" class="${subtitleClasses}">${subtitle.text}</span>`;
const lines = subtitle.text.split('\n');
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change should be repeated on line 198 to get the same behavior when DOM caching is disabled.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
image

const wrappedText = lines.map((line) => `<p class="subtitle-line">${line}</p>`).join('');
return `<span style="${subtitleStyles}" class="${subtitleClasses}">${wrappedText}</span>`;
};

interface ShowingSubtitleProps {
Expand Down Expand Up @@ -196,7 +198,12 @@ const ShowingSubtitle = ({
/>
);
} else {
content = <span style={subtitleStyles}>{subtitle.text}</span>;
const lines = subtitle.text.split('\n');
content = lines.map((line, index) => (
<p key={index} className="subtitle-line" style={subtitleStyles}>
{line}
</p>
));
}

return (
Expand Down
5 changes: 5 additions & 0 deletions common/app/components/video-player.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,8 @@
.asbplayer-subtitles-blurred:hover {
filter: none;
}

.subtitle-line {
margin: 0;
padding: 0;
}
Loading