summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorShyam Sunder <sgsunder1@gmail.com>2023-04-17 12:21:26 -0400
committerShyam Sunder <sgsunder1@gmail.com>2023-04-17 12:21:26 -0400
commit648121d7c355953c357227641329b7f128ecc577 (patch)
treef2302df3566cabc577d80cb8ec8e8f547831155d /client
parent2165b59158462ee01d1d3fe2941b29aadaf8d898 (diff)
parent42524503b9fb5a73c69402c435e8d7aee3e036fa (diff)
client+server: add quicktime video support
Merge branch 'skybldev-upstream'
Diffstat (limited to 'client')
-rw-r--r--client/html/post_merge_side.tpl1
-rw-r--r--client/html/post_readonly_sidebar.tpl1
-rw-r--r--client/js/views/post_upload_view.js2
3 files changed, 4 insertions, 0 deletions
diff --git a/client/html/post_merge_side.tpl b/client/html/post_merge_side.tpl
index fe70502..a08070f 100644
--- a/client/html/post_merge_side.tpl
+++ b/client/html/post_merge_side.tpl
@@ -42,6 +42,7 @@
'image/heic': 'HEIC',
'video/webm': 'WEBM',
'video/mp4': 'MPEG-4',
+ 'video/quicktime': 'MOV',
'application/x-shockwave-flash': 'SWF',
}[ctx.post.mimeType] +
' (' +
diff --git a/client/html/post_readonly_sidebar.tpl b/client/html/post_readonly_sidebar.tpl
index 4f18624..0f93ae3 100644
--- a/client/html/post_readonly_sidebar.tpl
+++ b/client/html/post_readonly_sidebar.tpl
@@ -15,6 +15,7 @@
'image/heic': 'HEIC',
'video/webm': 'WEBM',
'video/mp4': 'MPEG-4',
+ 'video/quicktime': 'MOV',
'application/x-shockwave-flash': 'SWF',
}[ctx.post.mimeType] %>
</a>
diff --git a/client/js/views/post_upload_view.js b/client/js/views/post_upload_view.js
index fc98a19..4ef4c1a 100644
--- a/client/js/views/post_upload_view.js
+++ b/client/js/views/post_upload_view.js
@@ -22,6 +22,7 @@ function _mimeTypeToPostType(mimeType) {
"image/heic": "image",
"video/mp4": "video",
"video/webm": "video",
+ "video/quicktime": "video",
}[mimeType] || "unknown"
);
}
@@ -120,6 +121,7 @@ class Url extends Uploadable {
heif: "image/heif",
heic: "image/heic",
mp4: "video/mp4",
+ mov: "video/quicktime",
webm: "video/webm",
};
for (let extension of Object.keys(mime)) {