From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 21 Apr 2017 17:46:53 +0000 (+0200)
Subject: done #1366 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=f7818986e95816de4bcc7101e81c375ae75568cb;p=fluidbook-html5.git

done #1366 @1
---

diff --git a/js/libs/fluidbook/fluidbook.desktop.js b/js/libs/fluidbook/fluidbook.desktop.js
index 8892433a..a103666f 100644
--- a/js/libs/fluidbook/fluidbook.desktop.js
+++ b/js/libs/fluidbook/fluidbook.desktop.js
@@ -11,7 +11,7 @@ FluidbookDesktop.prototype = {
         $(document).on('click', '#links', function (e) {
             $this.clickZoom(e);
         });
-        $(document).on('click', '#links .link', function (e) {
+        $(document).on('click', '#links .link:not(.eventOverlayLink)', function (e) {
             e.stopPropagation();
         })
 
diff --git a/style/fluidbook.css b/style/fluidbook.css
index ee5c8f8f..0321dc72 100644
--- a/style/fluidbook.css
+++ b/style/fluidbook.css
@@ -161,6 +161,9 @@ a {
 #links .link {
   cursor: auto;
 }
+#links .link.eventOverlayLink {
+  cursor: inherit;
+}
 .link {
   -webkit-transform-origin: 0 0 0;
   -moz-transform-origin: 0 0 0;
@@ -600,11 +603,16 @@ header.hidden,
 #links .link {
   position: absolute;
   cursor: auto;
+  z-index: 3;
+}
+#links .link.eventOverlayLink {
   z-index: 2;
 }
 .link.multimedia {
   position: absolute;
   z-index: 1 !important;
+  -ms-touch-action: manipulation;
+  touch-action: manipulation;
 }
 .link.multimedia.notinteractive {
   pointer-events: none;
diff --git a/style/fluidbook.less b/style/fluidbook.less
index ad09abcb..e1c67b2e 100644
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -183,6 +183,9 @@ a {
 
 #links .link {
 	cursor: auto;
+	&.eventOverlayLink {
+		cursor: inherit;
+	}
 }
 
 .link {
@@ -692,12 +695,18 @@ footer.hidden, header.hidden, #interface.hidden {
 #links .link {
 	position: absolute;
 	cursor: auto;
-	z-index: 2;
+	z-index: 3;
+	&.eventOverlayLink {
+		z-index: 2;
+	}
 }
 
 .link.multimedia {
 	position: absolute;
 	z-index: 1 !important;
+	-ms-touch-action: manipulation;
+	touch-action: manipulation;
+
 	&.notinteractive {
 		pointer-events: none;
 	}