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

Support video for Safari in zimit2 #613

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support video for Safari in zimit2 #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5fb55e
Support video for Safari in zimit2
Jaifroid May 31, 2024
08a6308
Merge branch 'main' into Support-video-for-Safari-in-zimit2
Jaifroid Jun 16, 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
2 changes: 1 addition & 1 deletion service-worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ function fetchUrlFromZIM (urlObjectOrString, range, expectedHeaders) {

var slicedData = msgPortEvent.data.content;

if (range && zimType === 'zimit') {
if (range && /zimit/.test(zimType)) {
headers.set('Content-Range', range + '/*');
} else if (range && slicedData !== null) {
// The browser asks for a range of bytes (usually for a video or audio stream)
Expand Down
2 changes: 1 addition & 1 deletion www/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5988,7 +5988,7 @@ function displayArticleContentInContainer (dirEntry, htmlArticle) {
assetZIMUrlEnc = relAssetUrl.replace(indexRoot, '');
assetZIMUrlEnc = assetZIMUrlEnc + querystring;
}
if (params.zimType !== 'zimit') {
if (params.zimType !== 'zimit') { // Includes zimit2
// DEV: Note that deriveZimUrlFromRelativeUrl produces a *decoded* URL (and incidentally would remove any URI component
// if we had captured it). We therefore re-encode the URI with encodeURI (which does not encode forward slashes) instead
// of encodeURIComponent.
Expand Down