From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 24 Apr 2018 13:04:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into ecommerceremarkable
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=060a18665bbe821f6f313acab09866fab458457f;p=fluidbook-html5.git

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

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

060a18665bbe821f6f313acab09866fab458457f
diff --cc js/libs/fluidbook/fluidbook.links.js
index be52923e,64a751e9..7e45f9f0
--- a/js/libs/fluidbook/fluidbook.links.js
+++ b/js/libs/fluidbook/fluidbook.links.js
@@@ -78,8 -75,10 +75,9 @@@ FluidbookLinks.prototype = 
  
  
          $(document).on('click touchend', '[data-action]', function () {
 -
 -            var map = {'pdf': 'print', 'fullScreen': "fullscreen", 'locales': 'localesContainers'};
 +            var map = {'pdf': 'print', 'fullScreen': "fullscreen", 'locales': 'localesContainers', 'basket': 'cart'};
              var action = $(this).data('action');
+             var extra = $(this).data('extra');
              if (action == 'share') {
                  // Let share class handle this
                  return true;
diff --cc js/libs/fluidbook/fluidbook.nav.js
index 1769bd1e,3ea67a1e..dec0297a
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@@ -322,7 -331,9 +331,8 @@@ FluidbookNav.prototype = 
              var link2 = null;
  
              if (icon == 'home' && !skipHome) {
 -
                  var homeURL = this.fluidbook.datas.home;
+                 var homeRequireLoader = true;
                  if (this.fluidbook.datas.home == '%apphome%' || forceHome && DATAS.phonegap) {
                      homeURL = decodeURIComponent(window.localStorage.getItem('apphome'));
                  }