From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 5 Oct 2017 15:57:49 +0000 (+0200)
Subject: done #1711 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5e58323a2da8885cbda6ef12aee8d967e9917e7a;p=fluidbook-html5.git

done #1711 @0.5
---

diff --git a/js/libs/fluidbook/fluidbook.l10n.js b/js/libs/fluidbook/fluidbook.l10n.js
index 0af39ff1..12ce4336 100644
--- a/js/libs/fluidbook/fluidbook.l10n.js
+++ b/js/libs/fluidbook/fluidbook.l10n.js
@@ -16,6 +16,8 @@ FluidbookL10N.prototype = {
         this.lang = lang;
 
         this.dir = this.getLanguageDirection(this.getActiveLang());
+        this.ltr = (this.dir == 'ltr');
+        this.rtl = !this.ltr;
         $('html').attr('dir', this.dir);
         if (this.dir == 'rtl') {
             $('html').removeClass('ltr').addClass('rtl');
@@ -132,7 +134,7 @@ FluidbookL10N.prototype = {
             return name;
         }
 
-        switch(this.fluidbook.datas.multilangDisplay) {
+        switch (this.fluidbook.datas.multilangDisplay) {
             case 'lang':
                 name = details.langName;
                 break;
diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js
index 5ecfd529..79ab0256 100644
--- a/js/libs/fluidbook/fluidbook.loader.js
+++ b/js/libs/fluidbook/fluidbook.loader.js
@@ -172,7 +172,7 @@ FluidbookLoader.prototype = {
         $(page).children('.clinks').html(this.fluidbook.datas.clinks[pageNr]);
         $(page).children(".shade").html(this.loadPageShade(position));
     },
-    loadPageShade:function(position){
+    loadPageShade: function (position) {
         return this.loadImage('images/shadows/pages/' + position + '.png', this.fluidbook.datas.width / 4, this.fluidbook.datas.height);
     },
     loadLeftPage: function (page, doublePage, callback) {
@@ -264,7 +264,7 @@ FluidbookLoader.prototype = {
             div = $('<div />');
         }
 
-        left = (page % 2 == 0);
+        left = ((page % 2 == 0) && this.fluidbook.l10n.ltr) || ((page % 2 == 1) && this.fluidbook.l10n.rtl);
 
         var h = this.fluidbook.datas.thumbHeight;
         var s = Math.floor((page - 1) / 100);
diff --git a/js/libs/fluidbook/fluidbook.slider.js b/js/libs/fluidbook/fluidbook.slider.js
index 3cc3597e..464d48b8 100644
--- a/js/libs/fluidbook/fluidbook.slider.js
+++ b/js/libs/fluidbook/fluidbook.slider.js
@@ -95,6 +95,11 @@ FluidbookSlider.prototype = {
 
     getPageByX: function (pos) {
         var page;
+
+        if (this.fluidbook.l10n.rtl) {
+            pos = Math.max(0, this.sliderWidth - pos);
+        }
+
         if (this.fluidbook.resize.orientation == 'portrait') {
             page = Math.floor(pos / (this.sliderWidth / this.snapsCount)) + 1;
             pageMin = 1;
@@ -104,6 +109,7 @@ FluidbookSlider.prototype = {
         }
 
         return Math.min(this.fluidbook.datas.pages, Math.max(pageMin, page));
+
     },
 
     resize: function (ww, hh, single) {
@@ -158,6 +164,9 @@ FluidbookSlider.prototype = {
 
     getCursorXByPage: function (page) {
         var left;
+        if (this.fluidbook.l10n.rtl) {
+            page = this.fluidbook.datas.pages - page;
+        }
         if (this.fluidbook.resize.orientation == 'portrait') {
             left = this.snapsWidth * (page - 1);
         } else {
@@ -207,8 +216,14 @@ FluidbookSlider.prototype = {
         }
 
 
-        this.setThumb($("#sliderthumb .doubleThumb").find('.thumb.left'), left, !single);
-        this.setThumb($("#sliderthumb .doubleThumb").find('.thumb.right'), right, !single);
+        if (this.fluidbook.l10n.ltr) {
+            this.setThumb($("#sliderthumb .doubleThumb").find('.thumb.left'), left, !single);
+            this.setThumb($("#sliderthumb .doubleThumb").find('.thumb.right'), right, !single);
+        } else {
+            this.setThumb($("#sliderthumb .doubleThumb").find('.thumb.left'), right, !single);
+            this.setThumb($("#sliderthumb .doubleThumb").find('.thumb.right'), left, !single);
+        }
+
         this.fluidbook.bookmarks.updateBookmarks();
         $("#sliderthumb").css('left', this.getCursorXByPage(page) + (this.cursorWidth / 2) - ($("#sliderthumb").outerWidth() / 2));
     },