yetangitu/epub.js
1
0
Fork 0
mirror of https://github.com/futurepress/epub.js.git synced 2025-10-03 14:59:18 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1064 from futurepress/vertical_fixes

Browse source 
Fixes for vertical text flow
This commit is contained in:
Fred Chasen 2020-05-22 18:36:06 -07:00 • committed by GitHub
commit 0e4d194039
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/contents.js
View file

@ -69,7 +69,7 @@ class Contents {
// this.content.style.width = w; // this.content.style.width = w;
} }
return this.window.getComputedStyle(frame)["width"]; return parseInt(this.window.getComputedStyle(frame)["width"]);
} }
@ -92,7 +92,7 @@ class Contents {
// this.content.style.height = h; // this.content.style.height = h;
} }
return this.window.getComputedStyle(frame)["height"]; return parseInt(this.window.getComputedStyle(frame)["height"]);
} }
@ -113,7 +113,7 @@ class Contents {
content.style.width = w; content.style.width = w;
} }
return this.window.getComputedStyle(content)["width"]; return parseInt(this.window.getComputedStyle(content)["width"]);
} }
@ -135,7 +135,7 @@ class Contents {
content.style.height = h; content.style.height = h;
} }
return this.window.getComputedStyle(content)["height"]; return parseInt(this.window.getComputedStyle(content)["height"]);
} }
@ -184,10 +184,6 @@ class Contents {
height += border.height; height += border.height;
} }
if (height && rect.top) {
height += rect.top;
}
return Math.round(height); return Math.round(height);
} }
@ -1026,7 +1022,7 @@ class Contents {
this.layoutStyle("paginated"); this.layoutStyle("paginated");
if (dir === "rtl") { if (dir === "rtl" && axis === "horizontal") {
this.direction(dir); this.direction(dir);
} }
@ -1048,17 +1044,18 @@ class Contents {
this.css("padding-bottom", (gap / 2) + "px", true); this.css("padding-bottom", (gap / 2) + "px", true);
this.css("padding-left", "20px"); this.css("padding-left", "20px");
this.css("padding-right", "20px"); this.css("padding-right", "20px");
this.css(COLUMN_AXIS, "vertical");
} else { } else {
this.css("padding-top", "20px"); this.css("padding-top", "20px");
this.css("padding-bottom", "20px"); this.css("padding-bottom", "20px");
this.css("padding-left", (gap / 2) + "px", true); this.css("padding-left", (gap / 2) + "px", true);
this.css("padding-right", (gap / 2) + "px", true); this.css("padding-right", (gap / 2) + "px", true);
this.css(COLUMN_AXIS, "horizontal");
} }
this.css("box-sizing", "border-box"); this.css("box-sizing", "border-box");
this.css("max-width", "inherit"); this.css("max-width", "inherit");
this.css(COLUMN_AXIS, "horizontal");
this.css(COLUMN_FILL, "auto"); this.css(COLUMN_FILL, "auto");
this.css(COLUMN_GAP, gap+"px"); this.css(COLUMN_GAP, gap+"px");