]> _ Git - fluidbook-html5.git/commitdiff
Merge remote-tracking branch 'origin/master' into 3dflip
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 30 Aug 2018 12:58:24 +0000 (14:58 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 30 Aug 2018 12:58:24 +0000 (14:58 +0200)
1  2 
js/libs/fluidbook/fluidbook.js

index 2228a846939ca5acf9da5e2c6efad600ca353614,372fc3e89e5cf31ce99ded28b4cd51425c412d41..2225b3f1b348716f302594b3c691b0b2a76f559d
@@@ -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();