yetangitu/epub.js
1
0
Fork 0
mirror of https://github.com/futurepress/epub.js.git synced 2025-10-05 15:32:55 +02:00
Code Issues Releases Wiki Activity

Fixes for page counting

Browse source
This commit is contained in:
Fred Chasen 2017-08-09 17:19:02 -04:00
parent 8bfed1593c
commit 03e7ca085c
5 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/managers/default/index.js
View file

@ -547,6 +547,7 @@ class DefaultViewManager {
var container = this.container.getBoundingClientRect();
var left = 0;
let used = 0;
if(this.fullsize) {
left = window.scrollX;
@ -558,26 +559,30 @@ class DefaultViewManager {
let position = view.position().left;
let width = view.width();
let startPos = left + offset;
let endPos = startPos + this.layout.spreadWidth + this.layout.gap;
if (endPos > left + offset + width) {
endPos = left + offset + width;
// Find mapping
let start = left + container.left - position + used;
let end = start + this.layout.spreadWidth - used;
let mapping = this.mapping.page(view.contents, view.section.cfiBase, start, end);
// Find displayed pages
let startPos = left + used;
let endPos = startPos + this.layout.spreadWidth - used;
if (endPos > offset + width) {
endPos = offset + width;
used = this.layout.pageWidth;
}
let totalPages = this.layout.count(width).pages;
let currPage = Math.ceil((startPos - offset) / this.layout.spreadWidth);
let currPage = Math.floor((startPos - offset) / this.layout.pageWidth);
let pages = [];
let numPages = (endPos - startPos) / (this.layout.columnWidth + (this.layout.gap / 2));
let numPages = Math.floor((endPos - startPos) / this.layout.pageWidth);
for (var i = 1; i <= numPages; i++) {
let pg = currPage + i;
pages.push(pg);
}
let start = left + container.left - position;
let end = start + this.layout.spreadWidth + this.layout.gap;
let mapping = this.mapping.page(view.contents, view.section.cfiBase, start, end);
return {
index,
href,

14
src/managers/views/iframe.js
View file

@ -253,11 +253,12 @@ class IframeView {
// Get the contentWidth by resizing the iframe
// Check with a min reset of the textWidth
// width = this.contentWidth(textWidth);
// Add padding back
if (width % this.layout.width > 0) {
width += this.layout.gap / 2;
}
/*
columns = Math.ceil(width / (this.settings.layout.columnWidth));
columns = Math.ceil(width / this.settings.layout.delta);
if ( this.settings.layout.divisor > 1 &&
this.settings.layout.name === "reflowable" &&
(columns % 2 > 0)) {
@ -266,11 +267,6 @@ class IframeView {
}
*/
// Add padding back
if (width % this.layout.width > 0) {
width += this.layout.gap / 2;
}
// Save the textWdith
this._textWidth = textWidth;