diff --git a/lib/jli.js b/lib/jli.js index f6b8702..205b5d3 100755 --- a/lib/jli.js +++ b/lib/jli.js @@ -485,6 +485,7 @@ function makeScrollHandler(root, config){ var ignoring = false var cancelThreshold var scrolled + // XXX this and scroller.state are redundent... var scrolling = false var touch = false var touches = 0 @@ -550,6 +551,7 @@ function makeScrollHandler(root, config){ return false } + // XXX add limits to this... // XXX slow down drag when at limit... // XXX try and make this adaptive to stay ahead of the lags... @@ -599,16 +601,20 @@ function makeScrollHandler(root, config){ } return false } + function endMoveHandler(evt){ + touches = touch ? event.touches.length : 0 if(ignoring){ - ignoring = false + if(touches == 0){ + ignoring = false + } return } // XXX get real transition duration... setTransitionDuration($('.magazine'), 200) + x = touch ? event.changedTouches[0].pageX : evt.clientX y = touch ? event.changedTouches[0].pageY : evt.clientY - touches = touch ? event.touches.length : 0 // check if we are canceling... if(cancelThreshold && Math.abs(start_x-x) < cancelThreshold @@ -638,6 +644,7 @@ function makeScrollHandler(root, config){ return false } + var scroller = { options: { // if one of these is false, it will restrict scrolling in