From: Stephen Cameron <stephen@cubedesigners.com>
Date: Wed, 5 Dec 2018 16:00:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into printing
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9c625ef6de791e65dd166d31b2effcb2c1c86e36;p=fluidbook-html5.git

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

9c625ef6de791e65dd166d31b2effcb2c1c86e36
diff --cc js/libs/fluidbook/fluidbook.js
index 80a259bd,bbcaae57..f21e1067
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@@ -55,9 -61,7 +61,8 @@@ Fluidbook.prototype = 
          this.audiodescription = new FluidbookAudioDescription(this);
          this.sound = new FluidbookSound(this);
          this.slideshow = new FluidbookSlideshow(this);
 +        this.printing = new FluidbookPrint(this);
  
- 
          if (this.datas.basket) {
              this.cart = new FluidbookCart(this);
          }
diff --cc style/fluidbook.less
index 37537971,81f2bb0f..25429ac0
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@@ -2932,6 -3092,12 +3092,14 @@@ body > input 
  	}
  }
  
 +@import "print.less";
 +
  @import "additional.less";
+ 
+ #pscanvas {
+ 	visibility: hidden;
+ }
+ 
+ #loadedcontents {
+ 	display: none;
+ }