From 7b798df26c59a25e87ad075272128c23e7bb3ce1 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 20 Jul 2017 19:07:54 +0200
Subject: [PATCH] wip #1487 @1

---
 js/libs/fluidbook/fluidbook.desktop.js |  9 +++++++--
 js/libs/fluidbook/fluidbook.loader.js  |  1 -
 js/libs/fluidbook/fluidbook.slider.js  |  1 -
 js/libs/fluidbook/fluidbook.touch.js   | 18 +++++++++++-------
 js/libs/fluidbook/fluidbook.zoom.js    |  6 ------
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/js/libs/fluidbook/fluidbook.desktop.js b/js/libs/fluidbook/fluidbook.desktop.js
index 4d40501c..7b083ee0 100644
--- a/js/libs/fluidbook/fluidbook.desktop.js
+++ b/js/libs/fluidbook/fluidbook.desktop.js
@@ -24,13 +24,18 @@ FluidbookDesktop.prototype = {
             $this.wheelZoom(deltaY);
         })
 
+
         $(document).on('mousemove', 'body', function (e) {
             $this.moveZoom(e);
         });
     },
     moveZoom: function (e) {
-        var x = 100 * e.pageX / $(window).width();
-        var y = 100 * e.pageY / $(window).height();
+        if (this.fluidbook.zoom.zoom > 1) {
+            console.log(e.pageX + ' | ' + e.pageY);
+        }
+
+        var x = 100 * e.pageX / this.fluidbook.resize.ww;
+        var y = 100 * e.pageY / this.fluidbook.resize.hh;
 
         this.fluidbook.zoom.setOrigin(x + '%', y + '%')
     },
diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js
index a9c5d55a..ee6b45b9 100644
--- a/js/libs/fluidbook/fluidbook.loader.js
+++ b/js/libs/fluidbook/fluidbook.loader.js
@@ -247,7 +247,6 @@ FluidbookLoader.prototype = {
         }
     },
     _loadTexts: function (pageNr, callback) {
-        console.log('load texts ' + pageNr);
         var w = this.fluidbook.datas.width / 0.75;
         var h = this.fluidbook.datas.height / 0.75;
         this.texts[pageNr] = this.loadImage(this.getTextsURL(pageNr), w, h, 'image/svg+xml', callback);
diff --git a/js/libs/fluidbook/fluidbook.slider.js b/js/libs/fluidbook/fluidbook.slider.js
index 8db973c5..abfde35d 100644
--- a/js/libs/fluidbook/fluidbook.slider.js
+++ b/js/libs/fluidbook/fluidbook.slider.js
@@ -89,7 +89,6 @@ FluidbookSlider.prototype = {
             this.fluidbook.setCurrentPage(page);
         }
         if (updateCursor) {
-            console.log('move to page ' + page);
             this.updateCursorPosition(page);
         }
         return false;
diff --git a/js/libs/fluidbook/fluidbook.touch.js b/js/libs/fluidbook/fluidbook.touch.js
index c3d044c4..e03da99b 100644
--- a/js/libs/fluidbook/fluidbook.touch.js
+++ b/js/libs/fluidbook/fluidbook.touch.js
@@ -229,7 +229,6 @@ FluidbookTouch.prototype = {
             }
             return true;
         }
-
     },
 
     resetSlide: function () {
@@ -239,17 +238,22 @@ FluidbookTouch.prototype = {
         this.offsetY = 0;
     },
     setZoomOriginFromEvent: function (event) {
-        var cx = event.clientX || event.pageX;
-        var cy = event.clientY || event.pageY;
+        var cx = event.pageX;
+        var cy = event.pageY;
 
         var z = this.fluidbook.zoom.zoom;
         var zrect = $("#z").get(0).getBoundingClientRect();
 
-        var ox = cx - zrect.left;
-        var oy = cy - zrect.top;
+        // focus point in non zoomed coordinates
+        var ox = cx - zrect.left / z;
+        var oy = cy - zrect.top / z;
+
+        ox = ox / this.fluidbook.resize.ww;
+        oy = oy / this.fluidbook.resize.hh;
 
-        ox = (ox / (this.fluidbook.resize.ww * z));
-        oy = (oy / (this.fluidbook.resize.hh * z));
+        // touch pos in % of screen
+        var tx = cx / this.fluidbook.resize.ww;
+        var ty = cy / this.fluidbook.resize.hh;
 
         this.fluidbook.zoom.setOrigin(
             (ox * 100) + '%',
diff --git a/js/libs/fluidbook/fluidbook.zoom.js b/js/libs/fluidbook/fluidbook.zoom.js
index 6c2e5015..31e065bc 100644
--- a/js/libs/fluidbook/fluidbook.zoom.js
+++ b/js/libs/fluidbook/fluidbook.zoom.js
@@ -53,10 +53,7 @@ FluidbookZoom.prototype = {
             zoom = 1;
         }
 
-        console.log(end);
         if (end) {
-            console.log(direction + ' || ' + zoom);
-
             if (direction == 1) {
                 if (zoom < 1.5) {
                     zoom = 1.5;
@@ -68,9 +65,6 @@ FluidbookZoom.prototype = {
                     this.setTransition(true);
                 }
             }
-
-            console.log(' === ' + zoom + ' (' + this.zoom + ')');
-
         }
         if (this.zoom == zoom) {
 
-- 
2.39.5