scl/szurubooru
1
0
Fork 0
mirror of https://github.com/rr-/szurubooru.git synced 2025-07-17 08:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed thumbnails for non-images in post upload

Browse Source
This commit is contained in:
Marcin Kurczewski
2014-09-20 09:46:43 +02:00
parent a3fbe80281
commit 37da38e929
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
public_html/js/Presenters/PostUploadPresenter.js
View File

@ -124,16 +124,17 @@ App.Presenters.PostUploadPresenter = function(
function addPostFromUrl(url) {
var post = _.extend({}, getDefaultPost(), {url: url, source: url, fileName: url});
postAdded(post);
var matches = url.match(/watch.*?=([a-zA-Z0-9_-]+)/);
if (matches) {
var youtubeThumbnailUrl = 'http://img.youtube.com/vi/' + matches[1] + '/mqdefault.jpg';
post.thumbnail = youtubeThumbnailUrl;
} else {
postThumbnailLoaded(post);
} else if (url.match(/image|img|jpg|png|gif/i)) {
post.thumbnail = url;
postThumbnailLoaded(post);
}
postAdded(post);
postThumbnailLoaded(post);
}
function postAdded(post) {
@ -184,13 +185,19 @@ App.Presenters.PostUploadPresenter = function(
}
function updatePostThumbnailInForm(post) {
$el.find('.form-slider .thumbnail img')[0].setAttribute('src', post.thumbnail);
if (post.thumbnail === null) {
$el.find('.form-slider .thumbnail img').hide();
} else {
$el.find('.form-slider .thumbnail img').show()[0].setAttribute('src', post.thumbnail);
}
}
function updatePostThumbnailInTable(post) {
var $row = post.$tableRow;
if (post.thumbnail === null) {
$row.find('img')[0].setAttribute('src', util.transparentPixel());
//huge speedup thanks to this condition
if ($row.find('img').attr('src') !== post.thumbnail && post.thumbnail !== null) {
} else if ($row.find('img').attr('src') !== post.thumbnail) {
$row.find('img')[0].setAttribute('src', post.thumbnail);
}
}
@ -409,7 +416,7 @@ App.Presenters.PostUploadPresenter = function(
function postTableRowImageHovered(e) {
var $img = jQuery(this);
if ($img.attr('src')) {
if ($img.parents('tr').data('post').thumbnail) {
var $lightbox = jQuery('#lightbox');
$lightbox.find('img').attr('src', $img.attr('src'));
$lightbox