flynx/PortableMag
1
0
Fork 0
mirror of https://github.com/flynx/PortableMag.git synced 2025-11-01 04:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

doing magic testing...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-02-23 00:09:36 +04:00
parent b45f9996d0
commit 6ccc997d23
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
layout.js
View File

@ -69,7 +69,8 @@ function handleClick(evt, data){
setCurrentPage(target) setCurrentPage(target)
setTransitionDuration(mag, DEFAULT_TRANSITION_DURATION) setTransitionDuration(mag, DEFAULT_TRANSITION_DURATION)
setTransitionEasing(mag, 'ease') //setTransitionEasing(mag, 'ease')
setTransitionEasing(mag, 'cubic-bezier(0.33,0.66,0.66,1)')
} }
} }
@ -89,7 +90,8 @@ function makeSwipeHandler(action){
// full page view... // full page view...
var mag = $('.magazine') var mag = $('.magazine')
setTransitionDuration(mag, DEFAULT_TRANSITION_DURATION) setTransitionDuration(mag, DEFAULT_TRANSITION_DURATION)
setTransitionEasing(mag, 'ease-out') //setTransitionEasing(mag, 'ease-out')
setTransitionEasing(mag, 'cubic-bezier(0.33,0.66,0.66,1)')
action($('.current.page')) action($('.current.page'))
} }
@ -132,16 +134,19 @@ function handleScrollRelease(evt, data){
var _t = t var _t = t
t = Math.abs(t * ((at-first)/(at-to))) t = Math.abs(t * ((at-first)/(at-to)))
to = first to = first
setTransitionEasing(mag, 'linear') //setTransitionEasing(mag, 'linear')
setTransitionEasing(mag, 'cubic-bezier(0.33,0.66,0.66,1)')
} else if(to < last){ } else if(to < last){
// trim the time proportionally... // trim the time proportionally...
var _t = t var _t = t
t = Math.abs(t * ((at-last)/(at-to))) t = Math.abs(t * ((at-last)/(at-to)))
to = last to = last
setTransitionEasing(mag, 'linear') //setTransitionEasing(mag, 'linear')
setTransitionEasing(mag, 'cubic-bezier(0.33,0.66,0.66,1)')
} else { } else {
setTransitionEasing(mag, 'ease-out') //setTransitionEasing(mag, 'ease-out')
setTransitionEasing(mag, 'cubic-bezier(0.33,0.66,0.66,1)')
} }
setTransitionDuration(mag, t) setTransitionDuration(mag, t)
@ -151,7 +156,8 @@ function handleScrollRelease(evt, data){
// XXX this is a bit dumb at this point... // XXX this is a bit dumb at this point...
// XXX run this as a transition end handler... // XXX run this as a transition end handler...
setTimeout(function(){ setTimeout(function(){
setTransitionEasing(mag, 'ease-out') //setTransitionEasing(mag, 'ease-out')
setTransitionEasing(mag, 'cubic-bezier(0.33,0.66,0.66,1)')
setTransitionDuration(mag, DEFAULT_TRANSITION_DURATION) setTransitionDuration(mag, DEFAULT_TRANSITION_DURATION)
}, t+10) }, t+10)
@ -159,12 +165,14 @@ function handleScrollRelease(evt, data){
// do not let the user scroll out of view... // do not let the user scroll out of view...
} else { } else {
if(at > first){ if(at > first){
setTransitionEasing(mag, 'ease-in') //setTransitionEasing(mag, 'ease-in')
setTransitionEasing(mag, 'cubic-bezier(0.33,0.66,0.66,1)')
setTransitionDuration(mag, DEFAULT_TRANSITION_DURATION/2) setTransitionDuration(mag, DEFAULT_TRANSITION_DURATION/2)
setElementTransform(mag, first) setElementTransform(mag, first)
} else if(at < last){ } else if(at < last){
setTransitionEasing(mag, 'ease-in') //setTransitionEasing(mag, 'ease-in')
setTransitionEasing(mag, 'cubic-bezier(0.33,0.66,0.66,1)')
setTransitionDuration(mag, DEFAULT_TRANSITION_DURATION/2) setTransitionDuration(mag, DEFAULT_TRANSITION_DURATION/2)
setElementTransform(mag, last) setElementTransform(mag, last)
} }