ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2443 from FinnStutzenstein/lodashfix

Browse Source 
renamed contains to includes
This commit is contained in:
Norman Jäckel 2016-09-27 11:58:13 +02:00 committed by GitHub
commit 6595e838ed
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openslides/mediafiles/static/js/mediafiles/base.js
View File

@ -40,17 +40,17 @@ angular.module('OpenSlidesApp.mediafiles', [])
computed: { computed: {
is_pdf: ['filetype', function (filetype) { is_pdf: ['filetype', function (filetype) {
var PDF_FILE_TYPES = ['application/pdf']; var PDF_FILE_TYPES = ['application/pdf'];
return _.contains(PDF_FILE_TYPES, filetype); return _.includes(PDF_FILE_TYPES, filetype);
}], }],
is_image: ['filetype', function (filetype) { is_image: ['filetype', function (filetype) {
var IMAGE_FILE_TYPES = ['image/png', 'image/jpeg', 'image/gif']; var IMAGE_FILE_TYPES = ['image/png', 'image/jpeg', 'image/gif'];
return _.contains(IMAGE_FILE_TYPES, filetype); return _.includes(IMAGE_FILE_TYPES, filetype);
}], }],
is_video: ['filetype', function (filetype) { is_video: ['filetype', function (filetype) {
var VIDEO_FILE_TYPES = [ 'video/quicktime', 'video/mp4', 'video/webm', var VIDEO_FILE_TYPES = [ 'video/quicktime', 'video/mp4', 'video/webm',
'video/ogg', 'video/x-flv', 'application/x-mpegURL', 'video/MP2T', 'video/ogg', 'video/x-flv', 'application/x-mpegURL', 'video/MP2T',
'video/3gpp', 'video/x-msvideo', 'video/x-ms-wmv', 'video/x-matroska' ]; 'video/3gpp', 'video/x-msvideo', 'video/x-ms-wmv', 'video/x-matroska' ];
return _.contains(VIDEO_FILE_TYPES, filetype); return _.includes(VIDEO_FILE_TYPES, filetype);
}], }],
is_presentable: ['is_pdf', 'is_image', 'is_video', function (is_pdf, is_image, is_video) { is_presentable: ['is_pdf', 'is_image', 'is_video', function (is_pdf, is_image, is_video) {
return is_pdf || is_image || is_video; return is_pdf || is_image || is_video;