Merge branch 'master' into catalog

This commit is contained in:
ccd0 2014-09-16 15:26:27 -07:00
commit f50e7fe9a9

View File

@ -83,10 +83,9 @@ Gallery =
nodes.thumbs.scrollTop = 0 nodes.thumbs.scrollTop = 0
nodes.current.parentElement.scrollTop = 0 nodes.current.parentElement.scrollTop = 0
Gallery.open if image thumb = $ "[href='#{image.href}']", nodes.thumbs if image
$("[href='#{image.href}']", nodes.thumbs) or Gallery.images[0] thumb or= Gallery.images[Gallery.images.length-1]
else Gallery.open thumb if thumb
Gallery.images[0]
doc.style.overflow = 'hidden' doc.style.overflow = 'hidden'
nodes.total.textContent = Gallery.images.length nodes.total.textContent = Gallery.images.length