Merge pull request #39686 from nextcloud/fix/modern-mimetype

fix(core): Modernize JS for mimetype handling
nextcloud · Aug 16, 2023 · f3fa006 · f3fa006
2 parents 6d0dabe + 717276d
commit f3fa006
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/core/js/mimetype.js b/core/js/mimetype.js
@@ -42,21 +42,21 @@ OC.MimeType = {
 		var icon = mimeType.replace(new RegExp('/', 'g'), '-');
 
 		// Generate path
-		if (mimeType === 'dir' && $.inArray('folder', files) !== -1) {
+		if (mimeType === 'dir' && files.includes('folder')) {
 			return 'folder';
-		} else if (mimeType === 'dir-encrypted' && $.inArray('folder-encrypted', files) !== -1) {
+		} else if (mimeType === 'dir-encrypted' && files.includes('folder-encrypted')) {
 			return 'folder-encrypted';
-		} else if (mimeType === 'dir-shared' && $.inArray('folder-shared', files) !== -1) {
+		} else if (mimeType === 'dir-shared' && files.includes('folder-shared')) {
 			return 'folder-shared';
-		} else if (mimeType === 'dir-public' && $.inArray('folder-public', files) !== -1) {
+		} else if (mimeType === 'dir-public' && files.includes('folder-public')) {
 			return 'folder-public';
-		} else if ((mimeType === 'dir-external' || mimeType === 'dir-external-root') && $.inArray('folder-external', files) !== -1) {
+		} else if ((mimeType === 'dir-external' || mimeType === 'dir-external-root') && files.includes('folder-external')) {
 			return 'folder-external';
-		} else if ($.inArray(icon, files) !== -1) {
+		} else if (files.includes(icon)) {
 			return icon;
-		} else if ($.inArray(icon.split('-')[0], files) !== -1) {
+		} else if (files.includes(icon.split('-')[0])) {
 			return icon.split('-')[0];
-		} else if ($.inArray('file', files) !== -1) {
+		} else if (files.includes('file')) {
 			return 'file';
 		}
 
@@ -70,7 +70,7 @@ OC.MimeType = {
 	 * @return {string} Url to the icon for mimeType
 	 */
 	getIconUrl: function(mimeType) {
-		if (_.isUndefined(mimeType)) {
+		if (typeof mimeType === 'undefined') {
 			return undefined;
 		}
 
@@ -84,7 +84,7 @@ OC.MimeType = {
 		// First try to get the correct icon from the current theme
 		var gotIcon = null;
 		var path = '';
-		if (OC.theme.folder !== '' && $.isArray(OC.MimeTypeList.themes[OC.theme.folder])) {
+		if (OC.theme.folder !== '' && Array.isArray(OC.MimeTypeList.themes[OC.theme.folder])) {
 			path = OC.getRootPath() + '/themes/' + OC.theme.folder + '/core/img/filetypes/';
 			var icon = OC.MimeType._getFile(mimeType, OC.MimeTypeList.themes[OC.theme.folder]);