From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 6 Nov 2018 16:43:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into 3dflip
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=da9b64a1fd61af65cd82ad86fd8ea9e3992eaee2;p=fluidbook-html5.git

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

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

da9b64a1fd61af65cd82ad86fd8ea9e3992eaee2
diff --cc js/libs/fluidbook/fluidbook.js
index 902149c3,a5d03154..f1f74d3c
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@@ -219,17 -201,12 +219,18 @@@ Fluidbook.prototype = 
          this.help = new FluidbookHelp(this);
          this.help.displayAtStartup();
  
 +        // Trigger a resize
          resize();
  
 +        // Trigger ready event
          $(this).trigger('fluidbookready');
          $(this).trigger('fluidbook.ready');
+         $(document).trigger('fluidbook.ready');
 +
 +        // Initial address handling
 +        this.changeAddress();
      },
 +
      loadPlugins: function () {
          $.each(this.datas.plugins, function (k, plugin) {
              try {