diff --git a/index.html b/index.html index 50c83b1..0d8d890 100755 --- a/index.html +++ b/index.html @@ -159,12 +159,9 @@ $(document).ready(function(){ }, 500) }) + // testing scroll without zoom... + setPageScale(1) - // setup the editor buttons... - // XXX - - - }) diff --git a/layout-iscroll.html b/layout-iscroll.html index 74311ca..91b4032 100755 --- a/layout-iscroll.html +++ b/layout-iscroll.html @@ -148,6 +148,8 @@ $(document).ready(function(){ */ }) + // XXX gets overwritten by iscroll... + //setMagazineScale(1.2) /* diff --git a/magazine.js b/magazine.js index 5912c7b..cbad041 100755 --- a/magazine.js +++ b/magazine.js @@ -191,6 +191,9 @@ function getMagazineTitle(){ function getPageScale(){ return getElementScale($('.scaler')) } +function setPageScale(scale){ + return setElementScale($('.scaler'), scale) +} // NOTE: if page is not given get the current page number... @@ -215,8 +218,9 @@ function getPageAt(n){ function shiftMagazineTo(offset){ var mag = $('.magazine') + var scale = getMagazineScale() if(USE_TRANSFORM){ - var transform = 'translate('+ offset +'px, 0px) translateZ(0px)' + var transform = 'translate('+ offset +'px, 0px) scale('+ scale +') translateZ(0px)' mag.css({ '-ms-transform' : transform, '-webkit-transform' : transform, @@ -228,7 +232,7 @@ function shiftMagazineTo(offset){ left: 0, }) } else { - var transform = 'translate(0px, 0px) translateZ(0px)' + var transform = 'translate(0px, 0px) scale('+ scale +') translateZ(0px)' mag.css({ // NOTE: this will be wrong during a transition, that's why we // can pass the pre-calculated offset as an argument...