From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 30 Aug 2018 12:58:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 3dflip
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=064d6d01b4dfdcbb9f1d079a70968140543ca72a;p=fluidbook-html5.git

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

064d6d01b4dfdcbb9f1d079a70968140543ca72a
diff --cc js/libs/fluidbook/fluidbook.js
index 2228a846,372fc3e8..2225b3f1
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@@ -380,9 -373,14 +380,10 @@@ Fluidbook.prototype = 
              if (isNaN(page) || page == undefined) {
                  return this.setCurrentPage('1');
              }
 -            if (this.pad.enabled) {
 -                this.transitionAxis = this.pad.getTransitionAxis(this.currentPage, page);
 -            } else {
 -                this.transitionAxis = 'x';
 -            }
 +
              if (page != $this.currentPage) {
                  $($this).trigger('fluidbook.page.navigation', [page]);
+                 $($this).trigger('changePage', [page]);
              }
              if (this.landingpage !== undefined) {
                  this.landingpage.hide();