From 26e6787ff2a138ce1bcf0ef5a536988051847864 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 27 Sep 2013 13:46:02 +0000
Subject: [PATCH]

---
 js/libs/fluidbook/fluidbook.js      |  7 +++++++
 js/libs/fluidbook/fluidbook.l10n.js | 16 +++++++++++++++-
 js/libs/fluidbook/fluidbook.nav.js  | 11 +++++++----
 js/main.js                          |  5 +++++
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 8acd9b2d..75cef260 100644
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -100,6 +100,11 @@ Fluidbook.prototype = {
 		}
 		var $this = this;
 		setTimeout(function() {
+			try {
+				navigator.splashscreen.hide();
+			} catch (err) {
+
+			}
 			$this._hideSplash();
 		}, 3000);
 	},
@@ -110,6 +115,7 @@ Fluidbook.prototype = {
 		$("#splash").css('opacity', 0).one(this.support.getTransitionEndEvent(true), function() {
 			$(this).remove();
 		});
+
 	},
 	ready: function() {
 		if (this.isReady) {
@@ -732,6 +738,7 @@ Fluidbook.prototype = {
 			video: 'extras'};
 		if (this.gal != null && preload[view] != undefined) {
 			this.gal.downloadAndCall(preload[view], function() {
+
 				$this.__openView(view, param1, param2, callback);
 			});
 		} else {
diff --git a/js/libs/fluidbook/fluidbook.l10n.js b/js/libs/fluidbook/fluidbook.l10n.js
index baf50069..811c3674 100644
--- a/js/libs/fluidbook/fluidbook.l10n.js
+++ b/js/libs/fluidbook/fluidbook.l10n.js
@@ -33,10 +33,18 @@ FluidbookL10N.prototype = {
 		return this.fluidbook.datas.defaultLang;
 	},
 	initMultilang: function() {
+		var forceLocales = window.sessionStorage.getItem('locales');
+		console.log('force Locales ' + forceLocales);
+		var force = false;
+		if (forceLocales) {
+			force = true;
+			forceLocales = JSON.parse(forceLocales);
+		}
+
 		if (this.fluidbook.datas.multilang == '') {
 			return;
 		}
-		if (this.fluidbook.datas.multiApp) {
+		if (this.fluidbook.datas.multiApp && !force) {
 			return;
 		}
 
@@ -53,6 +61,12 @@ FluidbookL10N.prototype = {
 			if (l[0] == '') {
 				return;
 			}
+
+			var url = l[2];
+			if (force) {
+				url = '../' + forceLocales[l[0]] + '/index.html';
+			}
+
 			var o = {lang: l[0], flag: l[1], url: l[2], langName: l[3], countryName: l[4]};
 
 			$this.multilang[$this.multilang.length] = o;
diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index 7b9208f0..446fe6fc 100644
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -66,9 +66,13 @@ FluidbookNav.prototype = {
 		 */
 		var $this = this;
 		// index, chapters, print, friend, bookmark, pdf, archives, basket, fullscreen, sound, 3d, help
+
+		var skipHome = (window.sessionStorage.getItem('home') == '0');
+
 		for (var e in this.fluidbook.datas.navOrder) {
 			var icon = this.fluidbook.datas.navOrder[e];
-			if (icon == 'home') {
+			if (icon == 'home' && !skipHome) {
+
 				var homeURL = this.fluidbook.datas.home;
 				if (this.fluidbook.datas.home == '%apphome%') {
 					homeURL = decodeURIComponent();
@@ -76,7 +80,6 @@ FluidbookNav.prototype = {
 				if (homeURL != '') {
 					this.addLink('nav-home', window.sessionStorage.getItem('apphome'), 'home', 'home');
 				}
-
 			} else if (icon == 'index') {
 				this.addLink('nav-index', '#/index', 'index', 'overview');
 			} else if (icon == 'chapters') {
@@ -123,8 +126,8 @@ FluidbookNav.prototype = {
 					});
 				}
 			} else if (icon == 'lang') {
-				if (this.fluidbook.l10n.multilangEnabled) {
-					this.addMultilangLink();
+				if (this.fluidbook.l10n.multilangEnabled || forceLocales) {
+					this.addMultilangLink(forceLocales);
 				}
 			} else if (icon == 'archives') {
 				if (this.fluidbook.datas.archivesLink != '') {
diff --git a/js/main.js b/js/main.js
index cc56f797..3333bd9a 100644
--- a/js/main.js
+++ b/js/main.js
@@ -81,6 +81,9 @@ function onDeviceReady() {
 
 	}
 
+	console.log('cordova ready');
+	navigator.splashscreen.hide();
+
 	if (navigator.onLine && manifest) {
 		var readyToLoad = false;
 		var finishedLoading = false;
@@ -169,6 +172,8 @@ function init() {
 	fluidbook.loadPlugins();
 	fluidbook.loader.preloadPages();
 
+
+
 	desktopScale = 1;
 	desktopScaleAmount = 1.5;
 
-- 
2.39.5