wip #1254 @1.5

diff --git a/.gitignore b/.gitignore
index 485dee64bcfb48793379b200a1afd14e85a8aaf4..56f8b815a691d6fd9c14ec388501b9556732c9f7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .idea
+_doc
\ No newline at end of file

diff --git a/js/libs/fluidbook/fluidbook.resize.js b/js/libs/fluidbook/fluidbook.resize.js
index a2c9ef27d8101ad91132601ada1b437a40529fe6..aeb2bafc6bfd63d70d186ac8767433f540234964 100644 (file)
--- a/js/libs/fluidbook/fluidbook.resize.js
+++ b/js/libs/fluidbook/fluidbook.resize.js
@@ -2,8 +2,8 @@ function FluidbookResize(fluidbook) {
     this.fluidbook = fluidbook;
     var marginX = 50;
     var marginY = 20;
-    this.marginleft = marginX + this.fluidbook.datas.extraXSpace;
-    this.margintop = marginY + this.fluidbook.datas.extraYSpace;
+    this.marginleft = marginX + parseInt(this.fluidbook.datas.extraXSpace);
+    this.margintop = marginY + parseInt(this.fluidbook.datas.extraYSpace);
     this.marginbottom = marginY;
     this.marginright = marginX;
     this.corr = 0.8;
@@ -89,11 +89,9 @@ FluidbookResize.prototype = {
 
         this.resizeView();
 
-        var marginY, marginX, marginTop, marginBottom, marginLeft, marginRight;
+        var marginTop, marginBottom, marginLeft, marginRight;
 
         if (this.fluidbook.pad.enabled) {
-            marginY = 0;
-            marginX = 0;
             extraX = 0;
             marginTop = 0;
             marginBottom = 0;
@@ -105,9 +103,9 @@ FluidbookResize.prototype = {
                 extraX = 0;
             }
 
-            marginTop = (this.fluidbook.datas.menuHeight + this.margintop) * interfaceScale;
+            marginTop = (parseInt(this.fluidbook.datas.menuHeight) + this.margintop) * interfaceScale;
             marginBottom = (10 + this.marginbottom) * interfaceScale;
-            marginLeft = (this.marginleft + extraX) * interfaceScale;
+            marginLeft = (this.marginleft + parseInt(extraX)) * interfaceScale;
             marginRight = marginLeft;
         }
 
@@ -118,8 +116,24 @@ FluidbookResize.prototype = {
         if (this.orientation == 'landscape') {
             fww *= 2;
         }
+        // console.log('aw : ' + aw);
+        // console.log('fww : ' + fww);
+        // console.log('ah : ' + ah);
+        // console.log('fhh : ' + fhh);
+        // console.log('interfaceScale : ' + interfaceScale);
+        // console.log('extraX : ' + extraX);
+        // console.log('margintop : ' + this.margintop);
+        // console.log('marginbottom : ' + this.marginbottom);
+        // console.log('marginleft : ' + this.marginleft);
+        // console.log('marginright : ' + this.marginright);
+        console.log('marginLeft : ' + marginLeft);
+        console.log('marginTop : ' + marginTop);
+        console.log('marginBottom : ' + marginBottom);
+        console.log('marginRight : ' + marginRight);
+
 
         this.bookScale = Math.min(aw / fww, ah / fhh);
+        console.log('bookScale : ' + this.bookScale);
         var fw = this.bookScale * fww;
         var fh = this.bookScale * fhh;
         $("#fluidbook").transform({