flynx/PortableMag
1
0
Fork 0
mirror of https://github.com/flynx/PortableMag.git synced 2025-10-31 03:50:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

reverted to original state...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-02-23 17:10:27 +04:00
parent bba739562c
commit c9c9a93531
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
index2.html
View File

@ -135,17 +135,17 @@ $(document).ready(function(){
$('.viewer') $('.viewer')
.on('scrollCancelled', function(){ setCurrentPage() }) .on('scrollCancelled', function(){ setCurrentPage() })
//.on('shortClick', handleClick) .on('shortClick', handleClick)
/*
.on('swipeLeft', handleSwipeLeft) .on('swipeLeft', handleSwipeLeft)
.on('swipeRight', handleSwipeRight) .on('swipeRight', handleSwipeRight)
.on('screenReleased', handleScrollRelease) .on('screenReleased', handleScrollRelease)
*/ /*
.on('screenReleased swipeRight swipeLeft', handleScrollRelease) .on('screenReleased swipeRight swipeLeft', handleScrollRelease)
*/
// XXX stub... // XXX stub...
//setTransitionEasing($('.magazine'), 'ease-out') //setTransitionEasing($('.magazine'), 'ease-out')
setTransitionEasing($('.magazine'), 'cubic-bezier(0.33,0.66,0.66,1)') //setTransitionEasing($('.magazine'), 'cubic-bezier(0.33,0.66,0.66,1)')
prepareTransitions($('.magazine')) prepareTransitions($('.magazine'))
$('.viewer').css('overflow', 'hidden') $('.viewer').css('overflow', 'hidden')
@ -154,7 +154,7 @@ $(document).ready(function(){
// XXX for some reason this does not work correctly on android the // XXX for some reason this does not work correctly on android the
// first time... // first time...
//togglePageView('on') togglePageView('on')
}) })

30
layout.js
View File

@ -38,13 +38,18 @@ var togglePageView = createCSSClassToggler(
var view = $('.viewer') var view = $('.viewer')
var page = $('.page') var page = $('.page')
// XXX
setTransitionDuration($('.magazine'), 0)
if(action == 'on'){ if(action == 'on'){
var scale = getPageTargetScale(1) var scale = getPageTargetScale(1).value
setMagazineScale(scale) setMagazineScale(scale)
unanimated($('.magazine, .viewer'), togglePageFitMode)('on') //unanimated($('.magazine, .viewer'), togglePageFitMode)('on')
togglePageFitMode('on')
} else { } else {
unanimated($('.magazine, .viewer'), togglePageFitMode)('off') //unanimated($('.magazine, .viewer'), togglePageFitMode)('off')
var scale = getPageTargetScale(PAGES_IN_RIBBON) togglePageFitMode('off')
var scale = getPageTargetScale(PAGES_IN_RIBBON).value
setMagazineScale(scale) setMagazineScale(scale)
} }
// NOTE: can't disable transitions on this one because ScrollTo // NOTE: can't disable transitions on this one because ScrollTo
@ -177,8 +182,10 @@ function handleScrollRelease(evt, data){
} }
var USE_TRANSITIONS_FOR_ANIMATION = false // XXX this affects only the innertial part, not setCurrentPage...
var MIN_STEP = 24 var USE_TRANSITIONS_FOR_ANIMATION = true
//var MIN_STEP = 24
var MIN_STEP = 1
var animationFrame = function(){ var animationFrame = function(){
return (window.requestAnimationFrame return (window.requestAnimationFrame
@ -217,14 +224,13 @@ function animateElementTo(elem, to, duration, easing){
var prev_t = now var prev_t = now
function animate(t){ function animate(t){
/*
// XXX check if we are interrupted... // XXX check if we are interrupted...
if(scroller.animating){ //if(scroller.animating){
return // return
} //}
*/
// try and not render things too often... // try and not render things too often...
if(t - prev_t > MIN_STEP){ if(t - prev_t >= MIN_STEP){
// set position for current step... // set position for current step...
if(t < then){ if(t < then){
prev_t = t prev_t = t

1
navigator.js
View File

@ -89,7 +89,6 @@ function updateNavigator(n){
res = res < (bW-pW) ? res: (bW-pW) res = res < (bW-pW) ? res: (bW-pW)
// set indicator position... // set indicator position...
console.log('>>>', res)
pos.css({ pos.css({
left: res left: res
}) })