Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fail.

Browse Source
This commit is contained in:
Zixaphir 2014-04-04 20:50:30 -07:00
parent 453ebe7e74
commit ef886aea7f
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builds/appchan-x.user.js
View File

@ -10762,7 +10762,8 @@
$.addClass(thumb, 'expanding'); $.addClass(thumb, 'expanding');
if (post.file.fullImage) { if (post.file.fullImage) {
$.asap((function() { $.asap((function() {
return post.file.isVideo || post.file.fullImage.naturalHeight; var file;
return (file = post.file.fullImage) && (file.videoHeight || file.naturalHeight);
}), function() { }), function() {
return ImageExpand.completeExpand(post); return ImageExpand.completeExpand(post);
}); });
@ -10779,11 +10780,11 @@
} }
$.on(file, 'error', ImageExpand.error); $.on(file, 'error', ImageExpand.error);
$.asap((function() { $.asap((function() {
return post.file.isVideo || post.file.fullImage.naturalHeight; return (file = post.file.fullImage) && (file.videoHeight || file.naturalHeight);
}), function() { }), function() {
if (isVideo) { if (isVideo) {
img.style.maxHeight = img[naturalHeight] + "px"; file.style.maxHeight = file.videoHeight + "px";
img.style.maxWidth = img['videoWidth'] + "px"; file.style.maxWidth = file.videoWidth + "px";
} }
return ImageExpand.completeExpand(post); return ImageExpand.completeExpand(post);
}); });

9
builds/crx/script.js
View File

@ -10800,7 +10800,8 @@
$.addClass(thumb, 'expanding'); $.addClass(thumb, 'expanding');
if (post.file.fullImage) { if (post.file.fullImage) {
$.asap((function() { $.asap((function() {
return post.file.isVideo || post.file.fullImage.naturalHeight; var file;
return (file = post.file.fullImage) && (file.videoHeight || file.naturalHeight);
}), function() { }), function() {
return ImageExpand.completeExpand(post); return ImageExpand.completeExpand(post);
}); });
@ -10817,11 +10818,11 @@
} }
$.on(file, 'error', ImageExpand.error); $.on(file, 'error', ImageExpand.error);
$.asap((function() { $.asap((function() {
return post.file.isVideo || post.file.fullImage.naturalHeight; return (file = post.file.fullImage) && (file.videoHeight || file.naturalHeight);
}), function() { }), function() {
if (isVideo) { if (isVideo) {
img.style.maxHeight = img[naturalHeight] + "px"; file.style.maxHeight = file.videoHeight + "px";
img.style.maxWidth = img['videoWidth'] + "px"; file.style.maxWidth = file.videoWidth + "px";
} }
return ImageExpand.completeExpand(post); return ImageExpand.completeExpand(post);
}); });

8
src/Images/ImageExpand.coffee
View File

@ -104,7 +104,7 @@ ImageExpand =
$.addClass thumb, 'expanding' $.addClass thumb, 'expanding'
if post.file.fullImage if post.file.fullImage
# Expand already-loaded/ing picture. # Expand already-loaded/ing picture.
$.asap (-> post.file.isVideo or post.file.fullImage.naturalHeight), -> $.asap (-> (file = post.file.fullImage) and (file.videoHeight or file.naturalHeight)), ->
ImageExpand.completeExpand post ImageExpand.completeExpand post
return return
file = file =
@ -116,11 +116,11 @@ ImageExpand =
file.loop = true file.loop = true
file.controls = Conf['Show Controls'] file.controls = Conf['Show Controls']
$.on file, 'error', ImageExpand.error $.on file, 'error', ImageExpand.error
$.asap (-> post.file.isVideo or post.file.fullImage.naturalHeight), -> $.asap (-> (file = post.file.fullImage) and (file.videoHeight or file.naturalHeight)), ->
if isVideo if isVideo
# XXX Firefox doesn't seem to size videos correctly? # XXX Firefox doesn't seem to size videos correctly?
img.style.maxHeight = img[naturalHeight] + "px" file.style.maxHeight = file.videoHeight + "px"
img.style.maxWidth = img['videoWidth'] + "px" file.style.maxWidth = file.videoWidth + "px"
ImageExpand.completeExpand post ImageExpand.completeExpand post
$.after (if file.controls then thumb.parentNode else thumb), file $.after (if file.controls then thumb.parentNode else thumb), file