mirror of
https://github.com/flynx/PortableMag.git
synced 2025-10-29 11:10:08 +00:00
some more refactoring...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
e10ae04aeb
commit
c13f29cd04
@ -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){
|
||||
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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user