From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 19 Jun 2017 15:12:53 +0000 (+0200)
Subject: wip #1445 @1.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9bc9070d5ba564100641a933d07e73992d772f23;p=fluidbook-html5.git

wip #1445 @1.5
---

diff --git a/js/libs/fluidbook/fluidbook.slider.js b/js/libs/fluidbook/fluidbook.slider.js
index 042226c2..8db973c5 100644
--- a/js/libs/fluidbook/fluidbook.slider.js
+++ b/js/libs/fluidbook/fluidbook.slider.js
@@ -23,19 +23,20 @@ FluidbookSlider.prototype = {
         });
 
         $("#slidercursor").on('mousedown', function (e) {
-            $this.dragCursor(e, false, false);
+            $this.dragCursor(e, false, true);
+            return true;
         });
 
         interact(document.getElementById("slidercursor")).draggable({
             inertia: false,
             onstart: function (event) {
-                return $this.dragCursor(event, false);
+                return $this.dragCursor(event, false, true);
             },
             onmove: function (event) {
-                return $this.dragCursor(event, false);
+                return $this.dragCursor(event, false, true);
             },
             onend: function (event) {
-                return $this.dragCursor(event, true);
+                return $this.dragCursor(event, true, true);
             }
         });
 
@@ -88,6 +89,7 @@ FluidbookSlider.prototype = {
             this.fluidbook.setCurrentPage(page);
         }
         if (updateCursor) {
+            console.log('move to page ' + page);
             this.updateCursorPosition(page);
         }
         return false;
@@ -147,8 +149,12 @@ FluidbookSlider.prototype = {
 
         $("#slidercursor").css('left', this.getCursorXByPage(page));
 
-        if ($("#sliderthumb").is(':visible') && !$("#slider").hasClass('hover')) {
-            this.updateThumb(page);
+        if ($("#sliderthumb").is(':visible')) {
+            if ($("#slider").hasClass('hover') && !$("#slider").hasClass('drag')) {
+
+            } else {
+                this.updateThumb(page);
+            }
         }
     },
 
diff --git a/style/fluidbook.less b/style/fluidbook.less
index 882361df..c45f311b 100644
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -175,11 +175,11 @@ body, html {
 /* Desktop devices */
 
 .desktop #links {
-	cursor: url("images/cur-zoom-in.cur"), url("../images/cur-zoom-in.cur"), zoom-in;
+	cursor: zoom-in;
 }
 
 .desktop.zoomed #links {
-	cursor: url("images/cur-zoom-out.cur"), url("../images/cur-zoom-out.cur"), zoom-out;
+	cursor: zoom-out;
 }
 
 #links .link {