wip #5240 @0.25

diff --git a/js/libs/fluidbook/fluidbook.bookmarks.js b/js/libs/fluidbook/fluidbook.bookmarks.js
index a3d0af2fc4e618806e432b4e734d6bec7ed54d3b..bb799991ca5f2e35be0147b9486daa0fc8c494ec 100644 (file)
--- a/js/libs/fluidbook/fluidbook.bookmarks.js
+++ b/js/libs/fluidbook/fluidbook.bookmarks.js
@@ -364,10 +364,14 @@ FluidbookBookmarks.prototype = {
     }, saveBookmarks: function () {
         this.fluidbook.cache.set('bookmarks', this.bookmarks);
     }, getSavedBookmarks: function () {
+        var res=[];
         if (this.fluidbook.cache.isset('bookmarks')) {
-            return this.fluidbook.cache.get('bookmarks');
+            res = this.fluidbook.cache.get('bookmarks');
+            if (res === undefined || res === null || res === 'undefined' || res === 'null' || res === '') {
+                res = [];
+            }
         }
-        return [];
+        return res;
     }, isBookmarked: function (page) {
         return this.areBookmarksAllowedOn(page) && this.bookmarks.indexOf(page) > -1;
     }, areBookmarksAllowedOn: function (pageNr) {