flynx/PortableMag
1
0
Fork 0
mirror of https://github.com/flynx/PortableMag.git synced 2025-10-31 20:10:13 +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 01:51:36 +04:00
parent 60dbc76a66
commit 25cd2fd0da
3 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext-lib/iscroll-custom.js
View File

@ -613,8 +613,6 @@ iScroll.prototype = {
step, easeOut, step, easeOut,
animate; animate;
console.log('steps:', that.steps.length)
if (that.animating) return; if (that.animating) return;
if (!that.steps.length) { if (!that.steps.length) {

10
index2.html
View File

@ -126,16 +126,6 @@ $(document).ready(function(){
//setTransformOrigin($('.magazine')) //setTransformOrigin($('.magazine'))
window.myScroll = new iScroll('viewer', {
vScroll: false,
//snap: '.page',
//momentum: false,
momentum: true,
hScrollbar: false,
})
myScroll.disable()
window.MagazineScroller = makeScrollHandler($('.viewer'), { window.MagazineScroller = makeScrollHandler($('.viewer'), {
hScroll: true, hScroll: true,
vScroll: false, vScroll: false,

38
lib/jli.js
View File

@ -220,13 +220,13 @@ function setElementTransform(elem, offset, scale){
var scale = getElementScale(elem) var scale = getElementScale(elem)
} }
if(USE_TRANSFORM){ if(USE_TRANSFORM){
var transform = 'translate('+ offset.left +'px, '+ offset.top +'px) scale('+ scale +') ' + t3d var transform = 'translate('+ Math.round(offset.left) +'px, '+ Math.round(offset.top) +'px) scale('+ scale +') ' + t3d
elem.css({ elem.css({
//'-ms-transform' : transform, '-ms-transform' : transform,
'-webkit-transform' : transform, '-webkit-transform' : transform,
//'-moz-transform' : transform, '-moz-transform' : transform,
//'-o-transform' : transform, '-o-transform' : transform,
//'transform' : transform, 'transform' : transform,
// XXX can we avoid this here?? // XXX can we avoid this here??
left: 0, left: 0,
@ -238,15 +238,15 @@ function setElementTransform(elem, offset, scale){
elem.css({ elem.css({
// NOTE: this will be wrong during a transition, that's why we // NOTE: this will be wrong during a transition, that's why we
// can pass the pre-calculated offset as an argument... // can pass the pre-calculated offset as an argument...
left: offset.left, left: Math.round(offset.left),
top: offset.top, top: Math.round(offset.top),
// XXX can we avoid this here?? // XXX can we avoid this here??
//'-ms-transform' : transform, '-ms-transform' : transform,
'-webkit-transform' : transform, '-webkit-transform' : transform,
//'-moz-transform' : transform, '-moz-transform' : transform,
//'-o-transform' : transform, '-o-transform' : transform,
//'transform' : transform, 'transform' : transform,
}) })
} }
return elem return elem
@ -324,10 +324,10 @@ function setTransitionEasing(elem, ease){
ms = ms + 'ms' ms = ms + 'ms'
} }
return elem.css({ return elem.css({
//'transition-timing-function': ease, 'transition-timing-function': ease,
//'-moz-transition-timing-function': ease, '-moz-transition-timing-function': ease,
//'-o-transition-timing-function': ease, '-o-transition-timing-function': ease,
//'-ms-transition-timing-function': ease, '-ms-transition-timing-function': ease,
'-webkit-transition-timing-function': ease '-webkit-transition-timing-function': ease
}) })
} }
@ -337,10 +337,10 @@ function setTransitionDuration(elem, ms){
ms = ms + 'ms' ms = ms + 'ms'
} }
return elem.css({ return elem.css({
//'transition-duration': ms, 'transition-duration': ms,
//'-moz-transition-duration': ms, '-moz-transition-duration': ms,
//'-o-transition-duration': ms, '-o-transition-duration': ms,
//'-ms-transition-duration': ms, '-ms-transition-duration': ms,
'-webkit-transition-duration': ms '-webkit-transition-duration': ms
}) })
} }