From: Stephen Cameron <stephen@cubedesigners.com>
Date: Wed, 31 May 2017 09:10:28 +0000 (+0200)
Subject: Merge branch 'master' into html5video
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=f6a950d26d62714d08348178745df236f9f4cfcf;p=fluidbook-html5.git

Merge branch 'master' into html5video
---

f6a950d26d62714d08348178745df236f9f4cfcf
diff --cc _index.html
index 9a3dff1c,ff0481a8..8cfd2bdc
--- a/_index.html
+++ b/_index.html
@@@ -8,9 -8,9 +8,9 @@@
  	<meta charset="utf-8">
  	<meta http-equiv="X-UA-Compatible" content="IE=Edge">
  	<meta http-equiv="Content-Security-Policy"
 -	      content="default-src * gap://ready file:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' *.google-analytics.com; img-src * data:">
 +	      content="default-src * gap://ready file:; style-src 'self' 'unsafe-inline'; font-src 'self' data:; script-src 'self' 'unsafe-inline' 'unsafe-eval' *.google-analytics.com *.youtube.com *.ytimg.com; img-src * data:">
  	<!--<meta name="apple-mobile-web-app-capable" content="yes">-->
- 	<meta name="viewport" content="initial-scale=1,minimum-scale=1">
+ 	<meta name="viewport" content="initial-scale=1,minimum-scale=1,user-scalable=no">
  	<meta name="google" content="notranslate">
  	<!-- $description -->
  	<!-- $style -->
diff --cc js/libs/fluidbook/fluidbook.links.js
index ee62c2f6,17efc1a0..085b21b2
--- a/js/libs/fluidbook/fluidbook.links.js
+++ b/js/libs/fluidbook/fluidbook.links.js
@@@ -59,10 -60,11 +60,12 @@@ FluidbookLinks.prototype = 
          $("#links").prepend('<a href="#" class="nonlinkarea"></a>');
          var $this = this;
          if (this.fluidbook.datas.linkBlinkTime > 0 && this.fluidbook.datas.mobileLinksRevealAnim) {
-             this.animateLinks();
+             setTimeout(function () {
+                 $this.animateLinks();
+             }, 1000);
          }
          setTimeout(function () {
 +            console.info('initVideos called from fluidbook.links');
              $this.fluidbook.initVideos();
          }, 1000);
          $(fluidbook).trigger('fluidbooklinksready');