flynx/PortableMag
1
0
Fork 0
mirror of https://github.com/flynx/PortableMag.git synced 2025-10-30 19:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

some more refactoring...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-02-20 07:19:51 +04:00
parent e10ae04aeb
commit c13f29cd04
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/jli.js
View File

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