From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 17 Aug 2018 13:19:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 3dflip
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=f18de7694a7db173114a2faeb0b2018d13200731;p=fluidbook-html5.git

Merge remote-tracking branch 'origin/master' into 3dflip
---

f18de7694a7db173114a2faeb0b2018d13200731
diff --cc js/libs/fluidbook/fluidbook.js
index bca1f26c,1725c316..7f885a6e
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@@ -96,9 -96,9 +96,10 @@@ Fluidbook.prototype = 
          }
  
          this.resize = new FluidbookResize(this);
 +        this.pagetransitions = new FluidbookPageTransition(this);
          this.stats = new FluidbookStats(this);
          this.stats.track(10);
+         this.flags = {};
  
          this.initTheme();
          this.initKeyboardShortcuts();
@@@ -373,9 -377,9 +374,9 @@@
              if (this.landingpage !== undefined) {
                  this.landingpage.hide();
              }
-             this.menu.closeView(function () {
+             this.menu._closeView(function () {
                  if (page != $this.currentPage) {
 -                    $this.pageTransition(page);
 +                    $this.pagetransitions.pageTransition(page);
                      $this.stats.track(0, page);
                  }
                  $this.zoom.resetZoom();