From a2221684af9c34d5e0db895d571d0654fa420752 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 18 Sep 2013 16:50:43 +0000
Subject: [PATCH]

---
 js/libs/fluidbook/fluidbook.js         |  2 +-
 js/libs/fluidbook/fluidbook.support.js | 45 ++++++++++++++------------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 17b728a7..ab86c707 100644
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -107,7 +107,7 @@ Fluidbook.prototype = {
 		this.ready();
 		$("#main").css('visibility', 'visible');
 		this.hideLoader(0, true);
-		$("#splash").css('opacity', 0).one(this.support.getTransitionEndEvent(), function() {
+		$("#splash").css('opacity', 0).one(this.support.getTransitionEndEvent(true), function() {
 			$(this).remove();
 		});
 	},
diff --git a/js/libs/fluidbook/fluidbook.support.js b/js/libs/fluidbook/fluidbook.support.js
index 05b7db35..1c185ac3 100644
--- a/js/libs/fluidbook/fluidbook.support.js
+++ b/js/libs/fluidbook/fluidbook.support.js
@@ -31,9 +31,14 @@ function FluidbookSupport(fluidbook) {
 }
 
 FluidbookSupport.prototype = {
-	getTransitionEndEvent: function() {
-		fb(this.transitionEndEvent);
-		return this.transitionEndEvent;
+	getTransitionEndEvent: function(all) {
+		if (all == undefined) {
+			all = false;
+		}
+		if (!all) {
+			return this.transitionEndEvent;
+		}
+		return "webkitTransitionEnd transitionend oTransitionEnd msTransitionEnd transitionEnd";
 	},
 	hasNetwork: function() {
 		if (navigator.onLine != undefined) {
@@ -75,27 +80,26 @@ FluidbookSupport.prototype = {
 			$(window).resize(function() {
 				resize();
 			});
-			return;
-		}
+		} else {
 
-		if ("onorientationchange" in window) {
-			window.addEventListener('orientationchange', function() {
-				if ($this.iOS) {
-					resize();
-				} else {
-					resize();
-					setTimeout(function() {
+			if ("onorientationchange" in window) {
+				window.addEventListener('orientationchange', function() {
+					if ($this.iOS) {
 						resize();
-					}, 750);
-				}
-			}, false);
-		} else {
-			setInterval(function() {
-				$this.checkOrientation();
-			}, 100);
+					} else {
+						resize();
+						setTimeout(function() {
+							resize();
+						}, 750);
+					}
+				}, false);
+			} else {
+				setInterval(function() {
+					$this.checkOrientation();
+				}, 100);
+			}
 		}
 
-
 		// Test transition end event
 		var div = document.createElement('div');
 		div.id = "my-transition-test";
@@ -111,6 +115,7 @@ FluidbookSupport.prototype = {
 		$('#my-transition-test').one("webkitTransitionEnd transitionend oTransitionEnd msTransitionEnd transitionEnd", function(e) {
 			if ($this.transitionEndEvent !== e.type) {
 				$this.transitionEndEvent = e.type;
+				fb($this.transitionEndEvent);
 			}
 			window.document.body.removeChild(div);
 		});
-- 
2.39.5