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 branch 'v0.3' of https://github.com/futurepress/epub.js into v0.3

Browse source
This commit is contained in:
Fred Chasen 2016-10-24 14:55:32 +02:00
commit f6247e5612
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/book.js
View file

@ -98,7 +98,7 @@ Book.prototype.open = function(_url, options){
if (window && window.location && uri) { if (window && window.location && uri) {
absoluteUri = uri.absoluteTo(window.location.href); absoluteUri = uri.absoluteTo(window.location.href);
this.url = absoluteUri.toString(); this.url = absoluteUri.toString();
} if (window && window.location) { } else if (window && window.location) {
this.url = window.location.href; this.url = window.location.href;
} else { } else {
this.url = _url; this.url = _url;

1
src/contents.js
View file

@ -600,6 +600,7 @@ Contents.prototype.columns = function(width, height, columnWidth, gap){
this.css("overflowY", "hidden"); this.css("overflowY", "hidden");
this.css("margin", "0"); this.css("margin", "0");
this.css("boxSizing", "border-box"); this.css("boxSizing", "border-box");
this.css("maxWidth", "inherit");
this.css(COLUMN_AXIS, "horizontal"); this.css(COLUMN_AXIS, "horizontal");
this.css(COLUMN_FILL, "auto"); this.css(COLUMN_FILL, "auto");