wait #4105 @0.75

diff --git a/js/libs/fluidbook/fluidbook.bookmarks.js b/js/libs/fluidbook/fluidbook.bookmarks.js
index 8eb9176aa99224e7f8ef9f2627c331af215301da..9ddd828ba8aca9fbbab4e409d1941c8319af4d85 100644 (file)
--- a/js/libs/fluidbook/fluidbook.bookmarks.js
+++ b/js/libs/fluidbook/fluidbook.bookmarks.js
@@ -537,7 +537,7 @@ FluidbookBookmarks.prototype = {
     getPrintPreview: function () {
 
         if (!this.hasBookmarkedPages()) {
-            return '<div class="thumb left blank"><div class="blank-mask"></div></div>';
+            return '<div class="thumb ' + (this.fluidbook.l10n.ltr ? 'left' : 'right') + ' blank"><div class="blank-mask"></div></div>';
         }
 
 

diff --git a/js/libs/fluidbook/fluidbook.keyboard.js b/js/libs/fluidbook/fluidbook.keyboard.js
index 7e9450e2c884c378278aacac5554a9b1ec1e3ce9..5ff30d0fdc8979585a460ae7601e3f8b48654874 100644 (file)
--- a/js/libs/fluidbook/fluidbook.keyboard.js
+++ b/js/libs/fluidbook/fluidbook.keyboard.js
@@ -168,7 +168,7 @@ FluidbookKeyboard.prototype = {
             }
             if (handler.key === 'pageup' || handler.key === 'pagedown' || handler.key === 'left' || handler.key === 'right') {
                 var dir = 'Next';
-                if (handler.key === 'pageup' || handler.key === 'left') {
+                if (handler.key === 'pageup' || (handler.key === 'left' && this.fluidbook.l10n.ltr) || (handler.key === 'right' && this.fluidbook.l10n.rtl)) {
                     dir = 'Previous';
                 }
                 var func = 'go' + dir;

diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index 2be9dd0612308232a4a4d17af799a38c7067f92a..cf8480fc4a4d639d624da5bb83354518de8257e2 100644 (file)
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@ -428,7 +428,10 @@ FluidbookMenu.prototype = {
             var h = ' style="height:' + dim.height + 'px;"';
             view += '<div class="doubleThumb"' + h + '><div class="thumb right"' + h + '>' + this.fluidbook.loader.getThumbImage(2, true) + '<div class="circle"></div><a href="#" class="bookmark right" data-enabled="enabled">' + getSpriteIcon('bookmark-corner') + '</a></div></div>';
         } else {
-            view += '<div class="doubleThumb"><div class="thumb left">' + this.fluidbook.loader.getThumbImage(2, true) + '<div class="circle"></div><a href="#" class="bookmark left" data-enabled="enabled">' + getSpriteIcon('bookmark-corner') + '</a></div><div class="thumb right">' + this.fluidbook.loader.getThumbImage(3, true) + '<div class="circle"></div><a href="#" class="bookmark right" data-enabled="enabled">' + getSpriteIcon('bookmark-corner') + '</a></div></div>';
+            var p1 = this.fluidbook.loader.getThumbImage(this.fluidbook.l10n.ltr ? 2 : 3, true);
+            var p2 = this.fluidbook.loader.getThumbImage(this.fluidbook.l10n.ltr ? 3 : 2, true);
+
+            view += '<div class="doubleThumb"><div class="thumb left">' + p1 + '<div class="circle"></div><a href="#" class="bookmark left" data-enabled="enabled">' + getSpriteIcon('bookmark-corner') + '</a></div><div class="thumb right">' + p2 + '<div class="circle"></div><a href="#" class="bookmark right" data-enabled="enabled">' + getSpriteIcon('bookmark-corner') + '</a></div></div>';
         }
         view += '</div>';
         view += '';

diff --git a/js/libs/fluidbook/fluidbook.print.js b/js/libs/fluidbook/fluidbook.print.js
index 1a7d9426d8d67461054b400cb929aec042d558d5..652fe6420b09a11da015478407d9d3b3e432d928 100644 (file)
--- a/js/libs/fluidbook/fluidbook.print.js
+++ b/js/libs/fluidbook/fluidbook.print.js
@@ -127,7 +127,7 @@ FluidbookPrint.prototype = {
             if (!this.compact) {
                 view += '<label aria-hidden="" for="allPages">';
                 view += '<div class="doubleThumb">';
-                view += '<div class="thumb left">';
+                view += '<div class="thumb ' + (this.fluidbook.l10n.ltr ? 'left' : 'right') + '">';
                 view += this.fluidbook.loader.getThumbImage(1, true);
                 view += '</div>'; // .thumb
                 view += '</div>'; // .doubleThumb

diff --git a/style/fluidbook.less b/style/fluidbook.less
index 80e73d29a78b6b5283f114543cdda8266f71be1d..79cb20d792107931a4694a3ea643b1a8d28c3cbd 100644 (file)
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -1660,6 +1660,10 @@ html.ios body.portrait #interface {
           width: @w;
           height: @h;
 
+          .pageholder{
+            max-height: @h;
+          }
+
           &:before {
             display: none;
           }
@@ -1981,6 +1985,7 @@ form input[type="text"], form input[type="email"] {
   &.here {
     background-color: @menu-select-background;
     color: @menu-select-text;
+    z-index: -2;
   }
 
   .overlay {
@@ -2028,6 +2033,7 @@ form input[type="text"], form input[type="email"] {
 
   .pageholder {
     overflow: hidden;
+    max-height: @thumb-height;
 
     img {
       width: 100%;
@@ -2120,7 +2126,7 @@ form input[type="text"], form input[type="email"] {
     left: -5px;
     width: unit(@thumb-width+11, px);
     height: @shade-height;
-    z-index: 0;
+    z-index: -1;
   }
 
 }

diff --git a/style/print.less b/style/print.less
index 08ca53683e132a6c9d8d7756cf335178819740cf..9866855777f3a0b00bcc067492f9ab41a20f65ed 100644 (file)
--- a/style/print.less
+++ b/style/print.less
@@ -40,14 +40,6 @@
 
   .thumb.right {
     left: @thumb-width; // Override default so there's no gap between pages
-
-    .rtl & {
-      left: 0;
-    }
-  }
-
-  .thumb.left{
-
   }
 
   // Blank pages