From e5ab9e29a57524d0e495cb9e2329614de9925e20 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 15 Nov 2013 09:52:51 +0000
Subject: [PATCH]

---
 js/libs/cube/util.js                 | 9 +++++++++
 js/libs/fluidbook/fluidbook.cache.js | 2 +-
 js/libs/fluidbook/fluidbook.js       | 2 +-
 js/libs/fluidbook/fluidbook.l10n.js  | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/js/libs/cube/util.js b/js/libs/cube/util.js
index 8fe8744c..3aa9be9d 100644
--- a/js/libs/cube/util.js
+++ b/js/libs/cube/util.js
@@ -13,6 +13,15 @@ function arrayRemove(array, element) {
 	return array;
 }
 
+function json_parse(str) {
+	try {
+		return JSON.parse(str);
+	} catch (err) {
+		fb(err);
+		fb(str);
+	}
+}
+
 function trim(str, charlist) {
 	// http://kevin.vanzonneveld.net
 	// +   original by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
diff --git a/js/libs/fluidbook/fluidbook.cache.js b/js/libs/fluidbook/fluidbook.cache.js
index 7482ddbf..5ef4632e 100644
--- a/js/libs/fluidbook/fluidbook.cache.js
+++ b/js/libs/fluidbook/fluidbook.cache.js
@@ -44,7 +44,7 @@ FluidbookCache.prototype = {
 		}
 		var f = res.substr(0, 1);
 		if (f == '[' || f == '{') {
-			res = JSON.parse(res);
+			res = json_parse(res);
 		}
 		return res;
 	},
diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 623b31fc..b739e5a9 100644
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -484,7 +484,7 @@ Fluidbook.prototype = {
 			}
 		}
 		res.loading = [res.currentLeft, res.currentRight];
-		return JSON.parse(JSON.stringify(res));
+		return json_parse(JSON.stringify(res));
 	},
 	reloadCurrentPage: function() {
 		this.pageTransition(this.currentPage);
diff --git a/js/libs/fluidbook/fluidbook.l10n.js b/js/libs/fluidbook/fluidbook.l10n.js
index e238c70a..243bcf41 100644
--- a/js/libs/fluidbook/fluidbook.l10n.js
+++ b/js/libs/fluidbook/fluidbook.l10n.js
@@ -40,7 +40,7 @@ FluidbookL10N.prototype = {
 		} else {
 			force = true;
 			try {
-				forceLocales = JSON.parse(forceLocales);
+				forceLocales = json_parse(forceLocales);
 			} catch (err) {
 				force = false;
 			}
-- 
2.39.5