more digging...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-02-18 19:47:40 +04:00
parent 718297df69
commit 4b3bb3dfc5

View File

@ -109,15 +109,17 @@ $(document).ready(function(){
var _x = null var _x = null
var _t = null var _t = null
USE_TRANSFORM = true USE_TRANSFORM = true
$('.viewer')
.on('mousedown touchstart', function(){ // XXX this is a stub, but need to keep the two types of events
// seporated as mouse events sometimes interfere with touch events...
if('touchmove' in window){
$('.viewer')
.on('touchstart', function(){
logger.log('[touchstart]') logger.log('[touchstart]')
//_t = evt.timeStamp || Date.now(); //_t = evt.timeStamp || Date.now();
scrolling = true scrolling = true
togglePageDragging('on') togglePageDragging('on')
}) })
.on('touchmove', function(evt){ .on('touchmove', function(evt){
evt.preventDefault() evt.preventDefault()
var pos_x = event.touches[0].pageX var pos_x = event.touches[0].pageX
@ -133,6 +135,20 @@ $(document).ready(function(){
} }
_x = x _x = x
}) })
.on('touchend', function(){
logger.log('[touchend]')
scrolling = false
togglePageDragging('off')
})
} else {
$('.viewer')
.on('mousedown', function(){
logger.log('[touchstart]')
//_t = evt.timeStamp || Date.now();
scrolling = true
togglePageDragging('on')
})
.on('mousemove', function(evt){ .on('mousemove', function(evt){
//var t = evt.timeStamp || Date.now(); //var t = evt.timeStamp || Date.now();
evt.preventDefault() evt.preventDefault()
@ -144,17 +160,17 @@ $(document).ready(function(){
var x = pos_x var x = pos_x
if(scrolling){ if(scrolling){
var s = getMagazineShift() var s = getMagazineShift()
logger.log('>>>' + s)
shiftMagazineTo(s + (x - _x)) shiftMagazineTo(s + (x - _x))
} }
_x = x _x = x
}) })
.on('mouseup', function(){
.on('mouseup touchend', function(){
logger.log('[touchend]') logger.log('[touchend]')
scrolling = false scrolling = false
togglePageDragging('off') togglePageDragging('off')
}) })
}
// XXX need to setup style for android to work... // XXX need to setup style for android to work...
$('.viewer').css({overflow: 'hidden'}) $('.viewer').css({overflow: 'hidden'})