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

Fix mapping for RTL

Browse source
This commit is contained in:
Fred Chasen 2020-06-18 11:32:43 -07:00
parent 19cb5ac10f
commit bb61a92f27
3 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/managers/continuous/index.js
View file

@ -163,6 +163,7 @@ class ContinuousViewManager extends DefaultViewManager {
if(this.settings.axis === "vertical") {
this.scrollBy(0, bounds.heightDelta, true);
} else {
console.log("counter", bounds.widthDelta)
this.scrollBy(bounds.widthDelta, 0, true);
}
@ -369,9 +370,11 @@ class ContinuousViewManager extends DefaultViewManager {
} else {
if(this.settings.direction === 'rtl') {
if (this.settings.rtlScrollType === "default") {
console.log("erase 1", window.scrollX, prevLeft, bounds.width);
this.scrollTo(prevLeft, 0, true);
}
else {
console.log("erase 2", prevLeft + Math.floor(bounds.width));
this.scrollTo(prevLeft + Math.floor(bounds.width), 0, true);
}
} else {

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

@ -660,11 +660,6 @@ class DefaultViewManager {
endPos = startPos + pageHeight - used;
totalPages = this.layout.count(height, pageHeight).pages;
stopPos = pageHeight;
// TODO: what was this doing? Seem to break things.
// if (endPos > stopPos) {
// endPos = stopPos;
// used = (endPos - startPos);
// }
} else {
startPos = offset + container.left - position.left + used;
endPos = startPos + pageWidth - used;
@ -716,21 +711,28 @@ class DefaultViewManager {
let sections = visible.map((view) => {
let {index, href} = view.section;
let offset = view.offset().left;
let position = view.position().left;
let offset;
let position = view.position();
let width = view.width();
// Find mapping
let start = left + container.left - position + offset + used;
let end = start + this.layout.width - used;
let start;
let end;
let pageWidth;
if (this.settings.direction === "rtl") {
start = width - left - container.width + container.left - position + offset + used;
end = start + this.layout.width - used;
offset = container.right - left;
pageWidth = Math.min(Math.abs(offset - position.left), this.layout.width) - used;
end = position.width - (position.right - offset) - used;
start = end - pageWidth;
} else {
start = left + container.left - position + offset + used;
end = start + this.layout.width - used;
offset = container.left + left;
pageWidth = Math.min(position.right - offset, this.layout.width) - used;
start = offset - position.left + used;
end = start + pageWidth;
}
used += pageWidth;
let mapping = this.mapping.page(view.contents, view.section.cfiBase, start, end);

2
src/mapping.js
View file

@ -10,7 +10,7 @@ import { nodeBounds } from "./utils/core";
* @param {boolean} [dev] toggle developer highlighting
*/
class Mapping {
constructor(layout, direction, axis, dev) {
constructor(layout, direction, axis, dev=false) {
this.layout = layout;
this.horizontal = (axis === "horizontal") ? true : false;
this.direction = direction || "ltr";