From: Stephen Cameron <stephen@Stephen.local>
Date: Fri, 2 Jun 2017 12:45:17 +0000 (+0200)
Subject: Fix fluidbook.js errors after merging with menus branch. WIP #897 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3f88e65a219e5a944e729d9e211a621151faffcc;p=fluidbook-html5.git

Fix fluidbook.js errors after merging with menus branch. WIP #897 @0.5
---

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 2bd68254..67fa1219 100644
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -303,7 +303,7 @@ Fluidbook.prototype = {
             }
 
             $($this).trigger('changePage', [page]);
-            this.closeView(function () {
+            this.menu.closeView(function () {
                 $this.pageTransition(page);
                 $this.zoom.resetZoom();
                 $this.stats.track(0, page);
@@ -311,7 +311,7 @@ Fluidbook.prototype = {
             }, true);
         }
         else {
-            this.openView(args[1], args[2], args[3], function () {
+            this.menu.openView(args[1], args[2], args[3], function () {
                 $this.hideSplash();
             });
             this.zoom.resetZoom();
@@ -658,17 +658,7 @@ Fluidbook.prototype = {
         }
         this.wopen(this.datas.url_link, '_blank');
     },
-    viewMode: function () {
-        return $("#view .mview").length > 0;
-    },
-    openView: function (view, param1, param2, callback) {
-        var $this = this;
-        this.displayLoader();
-        this.resetWaiters();
-        setTimeout(function () {
-            $this._openView(view, param1, param2, callback);
-        }, 20);
-    },
+
     addWaiter: function (reset) {
         if (reset == undefined) {
             reset = false;