From: Vincent <vincent@cubedesigners.com>
Date: Tue, 5 Sep 2017 14:01:12 +0000 (+0200)
Subject: fix #1644 @1.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=7e23aa924d4aea196ee680f54308f5850a0bc4b9;p=fluidbook-html5.git

fix #1644 @1.5
---

diff --git a/js/libs/fluidbook/fluidbook.desktop.js b/js/libs/fluidbook/fluidbook.desktop.js
index 7778a0e5..232a772e 100644
--- a/js/libs/fluidbook/fluidbook.desktop.js
+++ b/js/libs/fluidbook/fluidbook.desktop.js
@@ -30,10 +30,14 @@ FluidbookDesktop.prototype = {
         });
     },
     moveZoom: function (e, force) {
-        var x = e.pageX / this.fluidbook.resize.ww;
-        var y = e.pageY / this.fluidbook.resize.hh;
+        try {
+            var x = e.pageX / this.fluidbook.resize.ww;
+            var y = e.pageY / this.fluidbook.resize.hh;
 
-        this.fluidbook.zoom.setOriginPct(x, y, force)
+            this.fluidbook.zoom.setOriginPct(x, y, force);
+        }catch(err){
+
+        }
     },
     clickZoom: function (e, way) {
         if (way == undefined) {
diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index 0c981ac4..0148bfbe 100644
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@ -611,6 +611,13 @@ FluidbookMenu.prototype = {
             m.find('.content').perfectScrollbar('update');
         }
 
+        $("#popinOverlay>div").each(function () {
+            $(this).css({
+                top: (hh - $(this).outerHeight()) / 2,
+                left: (ww - $(this).outerWidth()) / 2
+            });
+        });
+
         if ($("#archivesview").length == 1) {
             var w = this.fluidbook.datas.filesInfos.archives.width;
             var ratio = $("#archivesview img").width() / w;
diff --git a/js/libs/fluidbook/fluidbook.support.js b/js/libs/fluidbook/fluidbook.support.js
index 9be43a4b..45f17fb4 100644
--- a/js/libs/fluidbook/fluidbook.support.js
+++ b/js/libs/fluidbook/fluidbook.support.js
@@ -98,12 +98,11 @@ FluidbookSupport.prototype = {
 
         var $this = this;
 
-        if (!this.isMobile) {
+        if (!isMobile(false)) {
             $(window).resize(function () {
                 resize();
             });
         } else {
-
             if ("onorientationchange" in window) {
                 window.addEventListener('orientationchange', function () {
                     resize();
diff --git a/js/libs/fluidbook/fluidbook.utils.js b/js/libs/fluidbook/fluidbook.utils.js
index d7d220b8..ef8bb8c8 100644
--- a/js/libs/fluidbook/fluidbook.utils.js
+++ b/js/libs/fluidbook/fluidbook.utils.js
@@ -1,9 +1,12 @@
-function isMobile() {
+function isMobile(returnTrueIfTouch) {
+    if(returnTrueIfTouch==undefined){
+        returnTrueIfTouch=true;
+    }
     var ua = navigator.userAgent;
     var devices = ['iphone', 'ipad', 'ipod', 'droid', 'blackberry', 'mobile', 'htc', 'samsung', 'nokia', 'archos', 'galaxy', 'motorola', 'pad', 'tab', 'slate', 'motorola', 'symbian', 'phone', 'nintendo', 'playstation', 'touch', 'webos', 'ericsson'];
     var pattern;
 
-    if (Modernizr.ftouch) {
+    if (Modernizr.ftouch && returnTrueIfTouch) {
         return true;
     }
 
diff --git a/js/main.js b/js/main.js
index 5c8334b8..5b6c2e59 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1,6 +1,7 @@
 var DEVICE_READY_BEFORE_JQUERY = false;
 var JQUERY_READY = false;
 document.addEventListener('deviceready', _onDeviceReady, false);
+
 function _onDeviceReady() {
     if (JQUERY_READY) {
         onDeviceReady();
@@ -438,16 +439,6 @@ function resize(init) {
         init = false;
     }
     fluidbook.resize.resize(init);
-
-    var ww = $(window).width();
-    var wh = $(window).height();
-    $("#popinOverlay>div").each(function () {
-        $(this).css({
-            top: (wh - $(this).outerHeight()) / 2,
-            left: (ww - $(this).outerWidth()) / 2
-        });
-    });
-
 }
 
 function goNextPage(e) {