From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 28 Aug 2017 10:49:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9980f9b7a0142d0f86ce74363c8a0a8179578f0f;p=fluidbook-html5.git

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	js/libs/fluidbook/fluidbook.js
---

9980f9b7a0142d0f86ce74363c8a0a8179578f0f
diff --cc js/libs/fluidbook/fluidbook.js
index 221e8700,b6844425..ce52fe77
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@@ -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) {