From cad72076daea749056357a76e624b6a66623e992 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Wed, 8 Feb 2012 12:17:26 -0500 Subject: [PATCH 1/4] Update readme.md --- readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 47bb3d9..ed01d2a 100755 --- a/readme.md +++ b/readme.md @@ -42,7 +42,8 @@ $('#magazine').turn({page: 1, shadows: true, acceleration: true}); jQuery 1.7 or later -[Full documentation on turnjs.com/#reference](http://www.turnjs.com/#reference) + +[Full documentation on turnjs.com/#reference](https://github.com/blasten/turn.js/wiki/Reference) * * * From 3e18d6f45a563b6ed6ca3d5741cae6a242e6934b Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Wed, 8 Feb 2012 12:18:59 -0500 Subject: [PATCH 2/4] Update readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index ed01d2a..054b6f7 100755 --- a/readme.md +++ b/readme.md @@ -43,7 +43,7 @@ jQuery 1.7 or later -[Full documentation on turnjs.com/#reference](https://github.com/blasten/turn.js/wiki/Reference) +[Full documentation](https://github.com/blasten/turn.js/wiki/Reference) * * * From aaafa4282782f10a3eafcf168c307601ed0f0f15 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Wed, 8 Feb 2012 12:21:44 -0500 Subject: [PATCH 3/4] Update turn.js --- turn.js | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/turn.js b/turn.js index 5bfcd5a..5f79df8 100644 --- a/turn.js +++ b/turn.js @@ -52,7 +52,7 @@ var pi = Math.PI, flipOptions = { - // Page back + // Back page back: null, @@ -152,7 +152,7 @@ turnMethods = { d.pages = {}; d.pageWrap = {}; d.pagePlace = {}; - d.pageMv = []; + d.pageMv = []; d.totalPages = l; @@ -530,8 +530,6 @@ turnMethods = { if (d.pagePlace[view[0]]==view[0]) apage = view[0]; else if (d.pagePlace[view[1]]==view[1]) apage = view[1]; - //console.log($.extend({}, pos), $.extend({}, d.pageMv)); - for (p = 1; p <= d.totalPages; p++) { d.pageWrap[p].css({'z-index': pos.pageZ[p] || 0, 'display': (pos.pageV[p]) ? '' : 'none'}); @@ -856,16 +854,13 @@ flipMethods = { } if (d.opt.frontShadow) { -//gradientSize - ppcen = gradientSize / ( (alpha100 ? (gradientSize-100)/gradientSize : 0; gradientEndPointA = P(gradientSize*Math.sin(a90-alpha)/height*100, gradientSize*Math.cos(a90-alpha)/width*100); if (top) gradientEndPointA.y = 100-gradientEndPointA.y; if (left) gradientEndPointA.x = 100-gradientEndPointA.x; + } if (d.opt.backShadow) { @@ -894,15 +889,11 @@ flipMethods = { d.fwrapper.transform(translate(-tr.x + mv.x + mvW, -tr.y + mv.y + mvH, ac) + rotate(-a), x); d.fpage.parent().transform(rotate(a) + translate(tr.x + df.x - mv.x, tr.y + df.y - mv.y, ac), x); - if (d.opt.frontShadow) // && !isTouch + if (d.opt.frontShadow) d.ashadow.css({'background-image': '-webkit-gradient(linear, ' + (left?100:0)+'% '+(top?100:0)+'%, ' + gradientEndPointA.x + '% ' + gradientEndPointA.y + '%, color-stop(' + gradientStartV + ',rgba(0,0,0,0)), color-stop(' + (((1-gradientStartV)*0.8)+gradientStartV) + ',rgba(0,0,0,'+(0.2*gradientOpacity)+')), to(rgba(255,255,255,'+(0.2*gradientOpacity)+')) )'}); - - //d.ashadow.css({'background-image': '-moz-linear-gradient('+(-a)+'deg, rgb(255,0,0) 0%, rgb(255,255,255) '+(ppcen/2)+'%, rgb(255,255,255) '+(ppcen*0.98)+'%, rgb(0,0,0) '+(ppcen*0.99)+'%, rgb(0,0,0) 99%)'}); - - // console.log(ppcen); - if (d.opt.backShadow) // && !isTouch + if (d.opt.backShadow) d.bshadow.css({'background-image': '-webkit-gradient(linear, ' + (left?0:100)+'% '+(top?0:100)+'%, ' + gradientEndPointB.x + '% ' + gradientEndPointB.y + '%, color-stop(0.8,rgba(0,0,0,0)), color-stop(1, rgba(0,0,0,'+(0.2*gradientOpacity)+')), to(rgba(0,0,0,0)) )'}); @@ -1111,7 +1102,6 @@ flipMethods = { }, duration: d.opt.duration, - /*duration: 10000,*/ turning: true }); From bd6c75dd55ffaefb286feb1a4d1745548500fe1c Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Wed, 8 Feb 2012 12:22:51 -0500 Subject: [PATCH 4/4] Update turn.js --- turn.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/turn.js b/turn.js index 5f79df8..cbe8a69 100644 --- a/turn.js +++ b/turn.js @@ -362,7 +362,6 @@ turnMethods = { d.tpage = prev; o.pageMv = page; - d.pages[prev].flip('hideThumbIndex', true); d.pages[page].trigger('flip'); @@ -393,7 +392,7 @@ turnMethods = { o.pageMv = o.page; turnMethods._addMv.apply(turn, [o.pageMv]); - dd.pagePlace[o.next] = o.page; + dd.pagePlace[o.next] = o.page; turn.turn('update'); },