Don't scroll out visible posts when invisible images get expanded. Close #938

This commit is contained in:
Nicolas Stepien 2013-03-02 23:28:26 +01:00
parent 737097e46a
commit 3abff121ee
2 changed files with 15 additions and 7 deletions

View File

@ -4543,13 +4543,15 @@
return $.after(thumb, img); return $.after(thumb, img);
}, },
completeExpand: function(post) { completeExpand: function(post) {
var thumb; var rect, root, thumb;
thumb = post.file.thumb; thumb = post.file.thumb;
if (!$.hasClass(thumb, 'expanding')) { rect = post.nodes.root.getBoundingClientRect();
return;
}
$.addClass(post.nodes.root, 'expanded-image'); $.addClass(post.nodes.root, 'expanded-image');
$.rmClass(thumb, 'expanding'); $.rmClass(post.file.thumb, 'expanding');
if (rect.top + rect.height <= 0) {
root = $.engine === 'webkit' ? d.body : doc;
root.scrollTop += post.nodes.root.clientHeight - rect.height;
}
return post.file.isExpanded = true; return post.file.isExpanded = true;
}, },
error: function() { error: function() {

View File

@ -3023,9 +3023,15 @@ ImageExpand =
completeExpand: (post) -> completeExpand: (post) ->
{thumb} = post.file {thumb} = post.file
return unless $.hasClass thumb, 'expanding' rect = post.nodes.root.getBoundingClientRect()
$.addClass post.nodes.root, 'expanded-image' $.addClass post.nodes.root, 'expanded-image'
$.rmClass thumb, 'expanding' $.rmClass post.file.thumb, 'expanding'
if rect.top + rect.height <= 0
root = if $.engine is 'webkit'
d.body
else
doc
root.scrollTop += post.nodes.root.clientHeight - rect.height
post.file.isExpanded = true post.file.isExpanded = true
error: -> error: ->