From c9c9a93531b79fc8852c0f04a718cb19629422f1 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Sat, 23 Feb 2013 17:10:27 +0400
Subject: [PATCH] reverted to original state...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 index2.html  | 10 +++++-----
 layout.js    | 30 ++++++++++++++++++------------
 navigator.js |  1 -
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/index2.html b/index2.html
index 8706672..8983ecf 100755
--- a/index2.html
+++ b/index2.html
@@ -135,17 +135,17 @@ $(document).ready(function(){
 
 	$('.viewer')
 		.on('scrollCancelled', function(){ setCurrentPage() })
-		//.on('shortClick', handleClick)
-		/*
+		.on('shortClick', handleClick)
 		.on('swipeLeft', handleSwipeLeft) 
 		.on('swipeRight', handleSwipeRight)
 		.on('screenReleased', handleScrollRelease)
-		*/
+		/*
 		.on('screenReleased swipeRight swipeLeft', handleScrollRelease)
+		*/
 
 	// XXX stub...
 	//setTransitionEasing($('.magazine'), 'ease-out')
-	setTransitionEasing($('.magazine'), 'cubic-bezier(0.33,0.66,0.66,1)')
+	//setTransitionEasing($('.magazine'), 'cubic-bezier(0.33,0.66,0.66,1)')
 	prepareTransitions($('.magazine'))
 	$('.viewer').css('overflow', 'hidden')
 
@@ -154,7 +154,7 @@ $(document).ready(function(){
 
 	// XXX for some reason this does not work correctly on android the 
 	//		first time...
-	//togglePageView('on')
+	togglePageView('on')
 })
 
 
diff --git a/layout.js b/layout.js
index ea4e615..f9f5929 100755
--- a/layout.js
+++ b/layout.js
@@ -38,13 +38,18 @@ var togglePageView = createCSSClassToggler(
 			var view = $('.viewer')
 			var page = $('.page')
 
+			// XXX
+			setTransitionDuration($('.magazine'), 0)
+
 			if(action == 'on'){
-				var scale = getPageTargetScale(1)
+				var scale = getPageTargetScale(1).value
 				setMagazineScale(scale)
-				unanimated($('.magazine, .viewer'), togglePageFitMode)('on')
+				//unanimated($('.magazine, .viewer'), togglePageFitMode)('on')
+				togglePageFitMode('on')
 			} else {
-				unanimated($('.magazine, .viewer'), togglePageFitMode)('off')
-				var scale = getPageTargetScale(PAGES_IN_RIBBON)
+				//unanimated($('.magazine, .viewer'), togglePageFitMode)('off')
+				togglePageFitMode('off')
+				var scale = getPageTargetScale(PAGES_IN_RIBBON).value
 				setMagazineScale(scale)
 			}
 			// NOTE: can't disable transitions on this one because ScrollTo
@@ -177,8 +182,10 @@ function handleScrollRelease(evt, data){
 }
 
 
-var USE_TRANSITIONS_FOR_ANIMATION = false
-var MIN_STEP = 24
+// XXX this affects only the innertial part, not setCurrentPage...
+var USE_TRANSITIONS_FOR_ANIMATION = true
+//var MIN_STEP = 24
+var MIN_STEP = 1
 
 var animationFrame = function(){
   return (window.requestAnimationFrame
@@ -217,14 +224,13 @@ function animateElementTo(elem, to, duration, easing){
 		var prev_t = now
 
 		function animate(t){
-			/*
 			// XXX check if we are interrupted...
-			if(scroller.animating){
-				return
-			}
-			*/
+			//if(scroller.animating){
+			//	return
+			//}
+
 			// try and not render things too often...
-			if(t - prev_t > MIN_STEP){
+			if(t - prev_t >= MIN_STEP){
 				// set position for current step...
 				if(t < then){
 					prev_t = t
diff --git a/navigator.js b/navigator.js
index 764e412..e95415f 100755
--- a/navigator.js
+++ b/navigator.js
@@ -89,7 +89,6 @@ function updateNavigator(n){
 	res = res < (bW-pW) ? res: (bW-pW)
 
 	// set indicator position...
-	console.log('>>>', res)
 	pos.css({
 		left: res 
 	})