arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Back and forward animation

Browse Source
This commit is contained in:
Tobias Reich 2014-03-27 00:16:39 +01:00
parent 10ad35877e
commit 994e881c5a
5 changed files with 50 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/build/main.css
View File

File diff suppressed because one or more lines are too long

2
assets/build/main.js
View File

File diff suppressed because one or more lines are too long

6
assets/css/imageview.css
View File

@ -33,9 +33,9 @@
background-position: 50% 50%; background-position: 50% 50%;
background-size: contain; background-size: contain;
-webkit-transition: top .3s, right .3s, bottom .3s, left .3s, margin-top .3s, -webkit-transform .3s cubic-bezier(0.51,.92,.24,1.15); -webkit-transition: top .3s, right .3s, bottom .3s, left .3s, margin-top .3s, opacity .1s, -webkit-transform .3s cubic-bezier(0.51,.92,.24,1.15);
-moz-transition: top .3s, right .3s, bottom .3s, left .3s, margin-top .3s, -moz-transform .3s cubic-bezier(0.51,.92,.24,1.15); -moz-transition: top .3s, right .3s, bottom .3s, left .3s, margin-top .3s, opacity .1s, -moz-transform .3s cubic-bezier(0.51,.92,.24,1.15);
transition: top .3s, right .3s, bottom .3s, left .3s, margin-top .3s, transform .3s cubic-bezier(0.51,.92,.24,1.15); transition: top .3s, right .3s, bottom .3s, left .3s, margin-top .3s, opacity .1s, transform .3s cubic-bezier(0.51,.92,.24,1.15);
-webkit-animation-name: zoomIn; -webkit-animation-name: zoomIn;
-webkit-animation-duration: .3s; -webkit-animation-duration: .3s;

14
assets/js/init.js
View File

@ -55,12 +55,8 @@ $(document).ready(function(){
/* Image View */ /* Image View */
lychee.imageview lychee.imageview
.on(event_name, ".arrow_wrapper.previous", function() { .on(event_name, ".arrow_wrapper.previous", photo.previous)
if (album.json&&album.json.content[photo.getID()]&&album.json.content[photo.getID()].previousPhoto!=="") lychee.goto(album.getID() + "/" + album.json.content[photo.getID()].previousPhoto) .on(event_name, ".arrow_wrapper.next", photo.next);
})
.on(event_name, ".arrow_wrapper.next", function() {
if (album.json&&album.json.content[photo.getID()]&&album.json.content[photo.getID()].nextPhoto!=="") lychee.goto(album.getID() + "/" + album.json.content[photo.getID()].nextPhoto)
});
/* Infobox */ /* Infobox */
$("#infobox") $("#infobox")
@ -121,11 +117,7 @@ $(document).ready(function(){
swipe.move(e.swipe); swipe.move(e.swipe);
}) })
.on('swipeEnd', function(e) { .on('swipeEnd', function(e) {
swipe.stop(e.swipe, function() { swipe.stop(e.swipe, photo.previous, photo.next);
if (album.json&&album.json.content[photo.getID()]&&album.json.content[photo.getID()].previousPhoto!=="") lychee.goto(album.getID() + "/" + album.json.content[photo.getID()].previousPhoto)
}, function() {
if (album.json&&album.json.content[photo.getID()]&&album.json.content[photo.getID()].nextPhoto!=="") lychee.goto(album.getID() + "/" + album.json.content[photo.getID()].nextPhoto)
});
}); });
} }

42
assets/js/photo.js
View File

@ -56,6 +56,48 @@ photo = {
}, },
previous: function() {
if (album.json&&
album.json.content[photo.getID()]&&
album.json.content[photo.getID()].previousPhoto!=="") {
$("#image").css({
WebkitTransform: 'translateX(100px)',
MozTransform: 'translateX(100px)',
transform: 'translateX(100px)',
opacity: 0
});
setTimeout(function() {
lychee.goto(album.getID() + "/" + album.json.content[photo.getID()].previousPhoto)
}, 100);
}
},
next: function() {
if (album.json&&
album.json.content[photo.getID()]&&
album.json.content[photo.getID()].nextPhoto!=="") {
$("#image").css({
WebkitTransform: 'translateX(-100px)',
MozTransform: 'translateX(-100px)',
transform: 'translateX(-100px)',
opacity: 0
});
setTimeout(function() {
lychee.goto(album.getID() + "/" + album.json.content[photo.getID()].nextPhoto);
}, 100);
}
},
delete: function(photoIDs) { delete: function(photoIDs) {
var params, var params,