Merge pull request #2975 from nextcloud/backport/stable24/heic-heif-s…

…upport
nextcloud · Sep 26, 2022 · fdcf2fc · fdcf2fc
2 parents 1f6d09a + 1af6cb4
commit fdcf2fc
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 22 deletions.
diff --git a/js/editor-rich.js b/js/editor-rich.js
diff --git a/js/editor-rich.js.map b/js/editor-rich.js.map
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/files-modal.js b/js/files-modal.js
diff --git a/js/files-modal.js.map b/js/files-modal.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/lib/Controller/ImageController.php b/lib/Controller/ImageController.php
@@ -50,6 +50,8 @@ class ImageController extends Controller {
 		'image/bmp',
 		'image/svg+xml',
 		'image/webp',
+		'image/heic',
+		'image/heif',
 	];
 
 	/**

diff --git a/src/components/EditorWrapper.vue b/src/components/EditorWrapper.vue
@@ -121,6 +121,8 @@ const IMAGE_MIMES = [
 	'image/bmp',
 	'image/svg+xml',
 	'image/webp',
+	'image/heic',
+	'image/heif',
 ]
 
 export default {

diff --git a/src/components/MenuBar.vue b/src/components/MenuBar.vue
@@ -24,7 +24,7 @@
 	<div class="menubar" :class="{ 'show': isVisible, 'autohide': autohide }">
 		<input ref="imageFileInput"
 			type="file"
-			accept="image/*"
+			accept="image/*, image/heic, image/heif"
 			aria-hidden="true"
 			class="hidden-visually"
 			:multiple="true"