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

fix(core): Modernize JS for mimetype handling #39686

Merged
merged 1 commit into from
Aug 16, 2023
Merged

fix(core): Modernize JS for mimetype handling #39686

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions core/js/mimetype.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}

Expand All @@ -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;
}

Expand All @@ -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]);

Expand Down
Loading