Skip to content

Commit

Permalink
GIF → MP4 더 완벽하게...
Browse files Browse the repository at this point in the history
  • Loading branch information
conory committed Sep 22, 2019
1 parent 1ac14a6 commit 1fcba0a
Show file tree
Hide file tree
Showing 7 changed files with 193 additions and 108 deletions.
36 changes: 24 additions & 12 deletions common/js/plugins/jquery.fileupload/js/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,20 @@
}

if(result.error == 0) {
if(/\.(jpe?g|png|gif)$/i.test(result.source_filename)) {
if(/\.(jpe?g|png|gif|webp)$/i.test(result.source_filename)) {
temp_code += '<img src="' + result.download_url + '" alt="' + result.source_filename + '" editor_component="image_link" data-file-srl="' + result.file_srl + '" />';
}
if(/\.(mp3)$/i.test(result.source_filename)) {
else if(/\.(mp3)$/i.test(result.source_filename)) {
temp_code += '<audio src="' + result.download_url + '" controls data-file-srl="' + result.file_srl + '" />';
}
if(/\.(mp4|webm)$/i.test(result.source_filename)) {
temp_code += '<video src="' + result.download_url + '" controls data-file-srl="' + result.file_srl + '" />';
else if(/\.(mp4|webm)$/i.test(result.source_filename)) {
if(/\.gif$/i.test(result.original_filename)) {
temp_code += '<video src="' + result.download_url + '" autoplay loop muted data-file-srl="' + result.file_srl + '" />';
} else {
temp_code += '<video src="' + result.download_url + '" controls data-file-srl="' + result.file_srl + '" />';
}
}

if(temp_code !== '') {
if (opt.autoinsertImage === 'paragraph') {
temp_code = "<p>" + temp_code + "</p>\n";
Expand Down Expand Up @@ -317,15 +322,20 @@
if(!result) return;
var temp_code = '';

if(/\.(jpe?g|png|gif)$/i.test(result.source_filename)) {
if(/\.(jpe?g|png|gif|webp)$/i.test(result.source_filename)) {
temp_code += '<img src="' + result.download_url + '" alt="' + result.source_filename + '" editor_component="image_link" data-file-srl="' + result.file_srl + '" />';
}
if(/\.(mp3)$/i.test(result.source_filename)) {
else if(/\.(mp3)$/i.test(result.source_filename)) {
temp_code += '<audio src="' + result.download_url + '" controls data-file-srl="' + result.file_srl + '" />';
}
if(/\.(mp4|webm)$/i.test(result.source_filename)) {
temp_code += '<video src="' + result.download_url + '" controls data-file-srl="' + result.file_srl + '" />';
else if(/\.(mp4|webm)$/i.test(result.source_filename)) {
if(/\.gif$/i.test(result.original_filename)) {
temp_code += '<video src="' + result.download_url + '" autoplay loop muted data-file-srl="' + result.file_srl + '" />';
} else {
temp_code += '<video src="' + result.download_url + '" controls data-file-srl="' + result.file_srl + '" />';
}
}

if(temp_code !== '') {
if (data.settings.autoinsertImage === 'paragraph') {
temp_code = "<p>" + temp_code + "</p>\n";
Expand Down Expand Up @@ -417,16 +427,18 @@
// 이미지와 그외 파일 분리
$.each(res.files, function (index, file) {
if(data.files[file.file_srl]) return;

data.files[file.file_srl] = file;
$container.data(data);

file.source_filename = file.source_filename.replace("&amp;", "&");
if(/\.(jpe?g|png|gif)$/i.test(file.source_filename)) {
if(file.thumbnail_filename) {
file.download_url = file.thumbnail_filename;
result_image.push(template_fileimte_image(file));
}
else
{
else if(/\.(jpe?g|png|gif|webp)$/i.test(file.source_filename)) {
result_image.push(template_fileimte_image(file));
} else {
result.push(template_fileimte(file));
}
});
Expand Down
34 changes: 19 additions & 15 deletions modules/document/document.item.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1126,30 +1126,34 @@ function getThumbnail($width = 80, $height = 0, $thumbnail_type = '')
// Find an image file among attached files if exists
if($this->hasUploadedFiles())
{
$file_list = $this->getUploadedFiles();

$first_image = null;
foreach($file_list as $file)
foreach($this->getUploadedFiles() as $file)
{
if($file->direct_download !== 'Y') continue;

if($file->cover_image === 'Y' && file_exists($file->uploaded_filename))
if($file->thumbnail_filename && file_exists($file->thumbnail_filename))
{
$source_file = $file->uploaded_filename;
break;
$file->uploaded_filename = $file->thumbnail_filename;
}

if($first_image) continue;

if(preg_match("/\.(jpe?g|png|gif|bmp)$/i", $file->source_filename))
else
{
if(file_exists($file->uploaded_filename))
if($file->direct_download !== 'Y' || !preg_match('/\.(jpe?g|png|gif|webp|bmp)$/i', $file->source_filename))
{
continue;
}
if(!file_exists($file->uploaded_filename))
{
$first_image = $file->uploaded_filename;
continue;
}
}
if($file->cover_image === 'Y')
{
$source_file = $file->uploaded_filename;
break;
}
if(!$first_image)
{
$first_image = $file->uploaded_filename;
}
}

if(!$source_file && $first_image)
{
$source_file = $first_image;
Expand Down
17 changes: 16 additions & 1 deletion modules/file/file.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,14 @@ function checkUpdate()
{
return true;
}

if(!$oDB->isColumnExists('files', 'original_filename'))
{
return true;
}
if(!$oDB->isColumnExists('files', 'thumbnail_filename'))
{
return true;
}
return false;
}

Expand Down Expand Up @@ -161,6 +168,14 @@ function moduleUpdate()
{
$oModuleController->insertTrigger('comment.copyCommentByDocument', 'file', 'controller', 'triggerAddCopyCommentByDocument', 'add');
}
if(!$oDB->isColumnExists('files', 'original_filename'))
{
$oDB->addColumn('files', 'original_filename', 'varchar', '250');
}
if(!$oDB->isColumnExists('files', 'thumbnail_filename'))
{
$oDB->addColumn('files', 'thumbnail_filename', 'varchar', '250');
}
}

/**
Expand Down
Loading

0 comments on commit 1fcba0a

Please sign in to comment.