Inertie sur le glissement de la pellicule.

[Portfolio.git] / skins / photo_film_viewer.js

diff --git a/skins/photo_film_viewer.js b/skins/photo_film_viewer.js
index 35679e1..0b1fde3 100644 (file)
--- a/skins/photo_film_viewer.js
+++ b/skins/photo_film_viewer.js
@@ -613,16 +613,46 @@ else if (browser.isIE6up) {
 
 FilmSlider.prototype.touchStartHandler = function(evt) {
        this.filmStartX = parseInt(this.film.style.left, 10);
 
 FilmSlider.prototype.touchStartHandler = function(evt) {
        this.filmStartX = parseInt(this.film.style.left, 10);

-       this.touchStartX = evt.pageX;
+       this.touchStartX = evt.changedTouches[0].screenX;
+       this.touchStartTime = (new Date()).getTime();

 };
 
 FilmSlider.prototype.touchMoveHandler = function(evt) {
 };
 
 FilmSlider.prototype.touchMoveHandler = function(evt) {

-       var delta = this.touchStartX - evt.pageX;
+       disableDefault(evt);
+       var delta = this.touchStartX - evt.changedTouches[0].screenX;

        var posX = this.filmStartX - delta;
        this.setFilmPosition(posX);
        var posX = this.filmStartX - delta;
        this.setFilmPosition(posX);

+    this.lastMoveTime = (new Date()).getTime();

 };
 
 FilmSlider.prototype.touchEndHandler = function(evt) {
 };
 
 FilmSlider.prototype.touchEndHandler = function(evt) {

+    var x = evt.changedTouches[0].screenX;
+       var delta = x - this.touchStartX;
+       if (delta) {
+               disableDefault(evt);
+        var now = (new Date()).getTime();
+        if (now - this.lastMoveTime < 100) {
+            // au delà de 100 ms de maintient, on annule l'inertie
+               var speed = delta / (now - this.touchStartTime)
+               var x0 = parseInt(this.film.style.left, 10);
+               var t0 = (new Date()).getTime();
+               var d = 500; // milisecondes
+            var delta = 0;
+            var dt = 25
+               var self = this;
+       
+               function animate() {
+                // inertie
+                       var t = (new Date()).getTime() - t0;
+                       if (t < d) {
+                               setTimeout(animate, dt);
+                               delta = delta + (1-t/d) * speed * dt; // décelleration linéaire
+                               self.setFilmPosition(x0 + delta);
+                       }
+               }
+               animate();
+        }
+       }

        this.touchStartX = undefined;
 };
 
        this.touchStartX = undefined;
 };