From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 18 Sep 2013 14:29:06 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9e658734a7204955e4efeedd038fb11027583e61;p=fluidbook-html5.git

---

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 845a28d6..17b728a7 100644
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -611,6 +611,7 @@ Fluidbook.prototype = {
 				$this.beforeTransition(pageNr, 2);
 				$("#currentDoublePage").addClass('axis_' + $this.transitionAxis).addClass('_2d').addClass(turning.currentToClass);
 				$(doublePage).removeClass(turning.nextFromClass).one($this.support.getTransitionEndEvent(), function() {
+					fb('received event');
 					if ($this.transitionning == false) {
 						return;
 					}
@@ -647,11 +648,15 @@ Fluidbook.prototype = {
 		this.hideUnnecessaryButtons(page);
 		var animationDuration = d <= 1 ? 0 : parseFloat(this.datas.mobileTransitionDuration);
 		this.updateShadows(page, animationDuration);
+
+		fb('beforeTransition ' + page);
 	},
 	afterTransition: function(page) {
 		if (this.transitionning === false) {
 			//return;
 		}
+		fb('afterTransition ' + page);
+
 		var $this = this;
 		this.currentPage = page;
 
diff --git a/js/libs/fluidbook/fluidbook.support.js b/js/libs/fluidbook/fluidbook.support.js
index 5f59b376..05b7db35 100644
--- a/js/libs/fluidbook/fluidbook.support.js
+++ b/js/libs/fluidbook/fluidbook.support.js
@@ -32,17 +32,8 @@ function FluidbookSupport(fluidbook) {
 
 FluidbookSupport.prototype = {
 	getTransitionEndEvent: function() {
-		if (this.transitionendevent == null) {
-			var transEndEventNames = {
-				'WebkitTransition': 'webkitTransitionEnd',
-				'MozTransition': 'transitionend',
-				'OTransition': 'oTransitionEnd',
-				'msTransition': 'MSTransitionEnd',
-				'transition': 'transitionend'
-			};
-			this.transitionendevent = transEndEventNames[ Modernizr.prefixed('transition') ];
-		}
-		return this.transitionendevent;
+		fb(this.transitionEndEvent);
+		return this.transitionEndEvent;
 	},
 	hasNetwork: function() {
 		if (navigator.onLine != undefined) {
@@ -104,6 +95,30 @@ FluidbookSupport.prototype = {
 			}, 100);
 		}
 
+
+		// Test transition end event
+		var div = document.createElement('div');
+		div.id = "my-transition-test";
+		div.style.position = 'absolute';
+		div.style.zIndex = -10;
+		div.style.bottom = '-1000px';
+		div.style.height = '100px';
+		div.style.width = '100px';
+		div.style.background = 'yellow';
+		div.style.display = 'hidden';
+		window.document.body.appendChild(div);
+
+		$('#my-transition-test').one("webkitTransitionEnd transitionend oTransitionEnd msTransitionEnd transitionEnd", function(e) {
+			if ($this.transitionEndEvent !== e.type) {
+				$this.transitionEndEvent = e.type;
+			}
+			window.document.body.removeChild(div);
+		});
+
+		setTimeout(function() {
+			div.style[Modernizr.prefixed('transition')] = '0.1s';
+			div.style[Modernizr.prefixed('transform')] = 'translate3d( 100px,0,0)';
+		}, 25);
 	},
 	checkOrientation: function() {
 		var o = this.getOrientation();
diff --git a/js/libs/modernizr/tests.js b/js/libs/modernizr/tests.js
index eda053c4..a32c7338 100644
--- a/js/libs/modernizr/tests.js
+++ b/js/libs/modernizr/tests.js
@@ -31,10 +31,10 @@ Modernizr.addTest('ftouch', function() {
 	return bool;
 });
 
-Modernizr.addTest('fullscreen',function(){
-     for(var i = 0; i < Modernizr._domPrefixes.length; i++) {
-        if( document[Modernizr._domPrefixes[i].toLowerCase() + 'CancelFullScreen'])
-            return true;
-     }
-     return !!document['cancelFullScreen'] || false;
+Modernizr.addTest('fullscreen', function() {
+	for (var i = 0; i < Modernizr._domPrefixes.length; i++) {
+		if (document[Modernizr._domPrefixes[i].toLowerCase() + 'CancelFullScreen'])
+			return true;
+	}
+	return !!document['cancelFullScreen'] || false;
 });
\ No newline at end of file
diff --git a/js/main.js b/js/main.js
index 12733061..02f8ecd3 100644
--- a/js/main.js
+++ b/js/main.js
@@ -36,6 +36,10 @@ $(function() {
 		}, false);
 	}
 
+	
+
+
+
 	if (DATAS.phonegap) {
 		loadPhonegap();
 	} else {