diff --git a/ext-lib/iscroll-custom.js b/ext-lib/iscroll-custom.js index 58c5e65..9ed437c 100755 --- a/ext-lib/iscroll-custom.js +++ b/ext-lib/iscroll-custom.js @@ -613,8 +613,6 @@ iScroll.prototype = { step, easeOut, animate; - console.log('steps:', that.steps.length) - if (that.animating) return; if (!that.steps.length) { diff --git a/index2.html b/index2.html index c2157b4..8706672 100755 --- a/index2.html +++ b/index2.html @@ -126,16 +126,6 @@ $(document).ready(function(){ //setTransformOrigin($('.magazine')) - window.myScroll = new iScroll('viewer', { - vScroll: false, - //snap: '.page', - //momentum: false, - momentum: true, - hScrollbar: false, - }) - myScroll.disable() - - window.MagazineScroller = makeScrollHandler($('.viewer'), { hScroll: true, vScroll: false, diff --git a/lib/jli.js b/lib/jli.js index 83165e6..ec98dbd 100755 --- a/lib/jli.js +++ b/lib/jli.js @@ -220,13 +220,13 @@ function setElementTransform(elem, offset, scale){ var scale = getElementScale(elem) } 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({ - //'-ms-transform' : transform, + '-ms-transform' : transform, '-webkit-transform' : transform, - //'-moz-transform' : transform, - //'-o-transform' : transform, - //'transform' : transform, + '-moz-transform' : transform, + '-o-transform' : transform, + 'transform' : transform, // XXX can we avoid this here?? left: 0, @@ -238,15 +238,15 @@ function setElementTransform(elem, offset, scale){ elem.css({ // NOTE: this will be wrong during a transition, that's why we // can pass the pre-calculated offset as an argument... - left: offset.left, - top: offset.top, + left: Math.round(offset.left), + top: Math.round(offset.top), // XXX can we avoid this here?? - //'-ms-transform' : transform, + '-ms-transform' : transform, '-webkit-transform' : transform, - //'-moz-transform' : transform, - //'-o-transform' : transform, - //'transform' : transform, + '-moz-transform' : transform, + '-o-transform' : transform, + 'transform' : transform, }) } return elem @@ -324,10 +324,10 @@ function setTransitionEasing(elem, ease){ ms = ms + 'ms' } return elem.css({ - //'transition-timing-function': ease, - //'-moz-transition-timing-function': ease, - //'-o-transition-timing-function': ease, - //'-ms-transition-timing-function': ease, + 'transition-timing-function': ease, + '-moz-transition-timing-function': ease, + '-o-transition-timing-function': ease, + '-ms-transition-timing-function': ease, '-webkit-transition-timing-function': ease }) } @@ -337,10 +337,10 @@ function setTransitionDuration(elem, ms){ ms = ms + 'ms' } return elem.css({ - //'transition-duration': ms, - //'-moz-transition-duration': ms, - //'-o-transition-duration': ms, - //'-ms-transition-duration': ms, + 'transition-duration': ms, + '-moz-transition-duration': ms, + '-o-transition-duration': ms, + '-ms-transition-duration': ms, '-webkit-transition-duration': ms }) }