Attempt to work with virtual page numbers. WIP #2498 @0.5

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 9e0e70c6c11a7a5691187c54b61ab82ff5f2d265..60f2b4a07c90cc79e087ee4505b71f81dffd5a86 100644 (file)
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -613,7 +613,7 @@ Fluidbook.prototype = {
         return this.datas.numerotation[page - 1];
     },
     virtualToPhysical: function (page) {
-        var i = this.datas.numerotation.indexOf(page);
+        var i = this.datas.numerotation.indexOf(page.toString());
         if (i == -1) {
             return false;
         }

diff --git a/js/libs/fluidbook/fluidbook.print.js b/js/libs/fluidbook/fluidbook.print.js
index bc5b0841a06d6bdb280d65426fa8f79b44dc4c8d..e11e36f1661c4ea70c6247de526a69b6c5255bd7 100644 (file)
--- a/js/libs/fluidbook/fluidbook.print.js
+++ b/js/libs/fluidbook/fluidbook.print.js
@@ -21,8 +21,8 @@ FluidbookPrint.prototype = {
                 mode = element.data('mode'), // Either 'print' or 'download'
                 print = (mode == 'print'),
                 choice = $('input[name="pageChoice"]:checked').val(),
-                rangeStart = parseInt($('#pageRangeStart').val()),
-                rangeEnd = parseInt($('#pageRangeEnd').val());
+                rangeStart = $this.fluidbook.virtualToPhysical($('#pageRangeStart').val()),
+                rangeEnd = $this.fluidbook.virtualToPhysical($('#pageRangeEnd').val());
 
             switch (choice) {
               case 'left':
@@ -197,9 +197,9 @@ FluidbookPrint.prototype = {
           view += '<input type="radio" name="pageChoice" value="range" id="pageRange">';
           view += '<label for="pageRange">';
           view += __('From page');
-          view += '<input class="page-range-input" type="text" id="pageRangeStart" value="' + rangeStart + '" autocomplete="off">';
+          view += '<input class="page-range-input" type="text" id="pageRangeStart" value="' + this.fluidbook.physicalToVirtual(rangeStart) + '" autocomplete="off">';
           view += __('to');
-          view += '<input class="page-range-input" type="text" id="pageRangeEnd" value="' + rangeEnd + '" autocomplete="off">';
+          view += '<input class="page-range-input" type="text" id="pageRangeEnd" value="' + this.fluidbook.physicalToVirtual(rangeEnd) + '" autocomplete="off">';
           view += '</label>';
           view += '</div>'; // .print-option
         }