]> _ Git - fluidbook-html5.git/commitdiff
Merge remote-tracking branch 'origin/master'
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Mon, 28 Aug 2017 10:49:27 +0000 (12:49 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Mon, 28 Aug 2017 10:49:27 +0000 (12:49 +0200)
# Conflicts:
# js/libs/fluidbook/fluidbook.js

1  2 
js/libs/fluidbook/fluidbook.js
js/libs/fluidbook/fluidbook.menu.js
js/libs/fluidbook/fluidbook.resize.js
style/fluidbook.less

index 221e870041f8c883178f9dab303e32bca5b4624b,b68444259dc356b6a4f07112dcf25db6312933af..ce52fe775430a883951ea83f52d938402d92f117
@@@ -346,6 -347,9 +346,10 @@@ Fluidbook.prototype = 
      },
      pageTransition: function (pageNr) {
  
+         $(this).trigger('fluidbook.beforePageTransition');
+         this.tooltip.hideTooltip();
++
          if (pageNr == undefined) {
              pageNr = this.currentPage;
              if (pageNr == -1) {
Simple merge
Simple merge
Simple merge