wip #1487 @1

diff --git a/js/libs/fluidbook/fluidbook.links.js b/js/libs/fluidbook/fluidbook.links.js
index 35882a1aea0adbcd609c5fd9c13840c74076b2db..282a954306d2ec295694e1b19b73c405f74a9870 100644 (file)
--- a/js/libs/fluidbook/fluidbook.links.js
+++ b/js/libs/fluidbook/fluidbook.links.js
@@ -17,7 +17,7 @@ FluidbookLinks.prototype = {
         $('body').append('<div id="zoomPopupOverlay"></div><div id="zoomPopupWrapper"><a href="#" class="zoomPopupClose">' + getSpriteIcon('interface-close') + '</a></div>');
 
 
-        $(document).on('click touchend', '.zoomPopup', function (e) {
+        $(document).on('click', '.zoomPopup', function (e) {
             e.preventDefault();
             $this.zoomLink(this);
             return false;
@@ -28,7 +28,7 @@ FluidbookLinks.prototype = {
             return true;
         });
 
-        $(document).on('click touchend', '#zoomPopupOverlay, #zoomPopupWrapper,  #zoomPopupClose', function (e) {
+        $(document).on('click', '#zoomPopupOverlay, #zoomPopupWrapper,  #zoomPopupClose', function (e) {
             $this.zoomLinkReset();
             return false;
         });

diff --git a/js/libs/fluidbook/fluidbook.tooltip.js b/js/libs/fluidbook/fluidbook.tooltip.js
index 06313a9ff37e2eabb644ffbeb499fc05f2802ebf..761f766014b6194ddbac81676ebd2467511f9c54 100644 (file)
--- a/js/libs/fluidbook/fluidbook.tooltip.js
+++ b/js/libs/fluidbook/fluidbook.tooltip.js
@@ -18,17 +18,12 @@ FluidbookTooltip.prototype = {
             $("#tooltip").transform({scale: 1 / zoom}).css({'marginTop': 20 / zoom, 'marginLeft': -10 / zoom});
         });
 
-        if (Modernizr.ftouch) {
-            $(document).on('touchstart', 'a[data-tooltip-touch][data-tooltip]', function (e) {
-                $this.updateMousePosition(e);
-                $this.eventTriggered(this);
-            });
-        } else {
+
             $(document).on('mouseover', 'a[data-tooltip]', function (e) {
                 $this.updateMousePosition(e);
                 $this.eventTriggered(this);
             });
-        }
+
         $("body").append('<div id="tooltip"></div>');
     },
 

diff --git a/style/fluidbook.less b/style/fluidbook.less
index 93bb4e208c13bd47e6369b84c4f7ff8af6417242..45b905814a8fde0c56914124374d1b12b20631a0 100644 (file)
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -237,7 +237,7 @@ body, html {
 
 /* Espaces forcés */
 
-#currentDoublePage{
+#currentDoublePage {
        pointer-events: none;
 }
 
@@ -756,11 +756,23 @@ html.ios body.portrait #interface {
        pointer-events: none;
 }
 
+@links-area-color: fadeout(@links-color, 40%);
 .link a {
        width: 100%;
        height: 100%;
        display: block;
        background-color: rgba(0, 0, 0, 0.01);
+       &.displayArea {
+               -webkit-tap-highlight-color: @links-area-color;
+               background-color: fadeout(@links-color, 99.999%);
+               &.animating {
+                       background-color: @links-area-color;
+               }
+               .no-ftouch &:hover {
+                       opacity: 1 !important;
+                       background-color: @links-area-color;
+               }
+       }
 }
 
 #links .nonlinkarea {