From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 31 May 2018 14:42:14 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into bourbon
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ab69cf2d3259e0765241e5dd811dd33a023c2f7f;p=fluidbook-html5.git

Merge remote-tracking branch 'origin/master' into bourbon
---

ab69cf2d3259e0765241e5dd811dd33a023c2f7f
diff --cc js/libs/fluidbook/fluidbook.js
index 04cc781e,7f2fa5ee..0963add8
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@@ -54,12 -56,11 +56,13 @@@ Fluidbook.prototype = 
          this.tooltip = new FluidbookTooltip(this);
          this.audiodescription = new FluidbookAudioDescription(this);
          this.sound = new FluidbookSound(this);
-         this.cart =new FluidbookCart(this);
- 
+         if(this.datas.basket) {
+             this.cart = new FluidbookCart(this);
+         }
          if (this.datas.form == 'bulle') {
              this.form = new FluidbookBulleForm(this);
 +        } else if (this.datas.form == 'bourbon') {
 +            this.form = new FluidbookBourbonForm(this);
          } else {
              this.form == false;
          }