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.

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

Fix MIME type checks #231

Merged
merged 1 commit into from Feb 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 10 additions & 4 deletions addon/system/data-transfer.js
Expand Up @@ -82,10 +82,16 @@ export default EmberObject.extend({
let extensions = A(tokens.filter(function (token) {
return token.indexOf('.') === 0;
}));
let mimeTypes = A(A(tokens.filter(function (token) {
let mimeTypeTests = A(A(tokens.filter(function (token) {
return token.indexOf('.') !== 0;
})).map(function (mimeType) {
return new RegExp(mimeType);
return function(type) {
if (A([ 'audio/*', 'video/*', 'image/*' ]).includes(mimeType)) {
return type.split('/')[0] === mimeType.split('/')[0];
} else {
return type === mimeType;
}
};
}));

return files.filter(function (file) {
Expand All @@ -95,8 +101,8 @@ export default EmberObject.extend({
}

let type = file.type.toLowerCase();
return mimeTypes.find(function (mimeType) {
return mimeType.test(type);
return mimeTypeTests.find(function (mimeTypeTest) {
return mimeTypeTest(type);
}) || extensions.indexOf(extension) !== -1;
});
}
Expand Down
48 changes: 47 additions & 1 deletion tests/unit/system/data-transfer-test.js
Expand Up @@ -177,4 +177,50 @@ module('data-transfer', function(hooks) {
}]);
assert.notOk(this.subject.get('valid'));
});
});

test('less common mime types', function (assert) {
this.subject.set('dataTransfer', {
items: [{
type: 'image/jpeg'
}, {
type: 'image/svg+xml'
}, {
type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
}]
});
this.subject.set('queue', {
multiple: true,
accept: 'image/svg+xml, application/vnd.openxmlformats-officedocument.wordprocessingml.document'
});

assert.equal(this.subject.get('files.length'), 2);
assert.deepEqual(this.subject.get('files'), [{
type: 'image/svg+xml'
}, {
type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
}]);
assert.notOk(this.subject.get('valid'));
});

test('mime type case sensitivity', function (assert) {
this.subject.set('dataTransfer', {
items: [{
type: 'image/jPeG'
}, {
type: 'VIdeo/mp4'
}]
});
this.subject.set('queue', {
multiple: true,
accept: 'image/JpEg, viDEO/mp4'
});

assert.equal(this.subject.get('files.length'), 2);
assert.deepEqual(this.subject.get('files'), [{
type: 'image/jPeG'
}, {
type: 'VIdeo/mp4'
}]);
assert.ok(this.subject.get('valid'));
});
});