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

Fixed locking to solve single page issues

Browse source
This commit is contained in:
Fred Chasen 2015-06-05 15:20:45 -04:00
parent 61ebe6d16e
commit 23ca0b840d
8 changed files with 32 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/epubjs/continuous.js
View file

@ -541,9 +541,9 @@ EPUBJS.Continuous.prototype.scrollTo = function(x, y, silent){
EPUBJS.Continuous.prototype.resizeView = function(view) {
if(this.settings.axis === "horizontal") {
view.lock(null, this.stage.height);
view.lock("height", this.stage.width, this.stage.height);
} else {
view.lock(this.stage.width, null);
view.lock("width", this.stage.width, this.stage.height);
}
};

2
lib/epubjs/layout.js
View file

@ -45,6 +45,7 @@ EPUBJS.Layout.Reflowable.prototype.calculate = function(_width, _height, _gap, _
this.column = colWidth;
this.gap = gap;
this.divisor = divisor;
};
EPUBJS.Layout.Reflowable.prototype.format = function(view){
@ -68,7 +69,6 @@ EPUBJS.Layout.Reflowable.prototype.format = function(view){
// Add extra padding for the gap between this and the next view
view.iframe.style.marginRight = this.gap+"px";
};
EPUBJS.Layout.Reflowable.prototype.count = function(view) {

4
lib/epubjs/rendition.js
View file

@ -305,9 +305,9 @@ EPUBJS.Rendition.prototype._remove = function(view) {
EPUBJS.Rendition.prototype.resizeView = function(view) {
if(this.globalLayoutProperties.layout === "pre-paginated") {
view.lock(this.stage.width, this.stage.height);
view.lock("both", this.stage.width, this.stage.height);
} else {
view.lock(this.stage.width, null);
view.lock("width", this.stage.width, this.stage.height);
}
};

11
lib/epubjs/view.js
View file

@ -78,7 +78,7 @@ EPUBJS.View.prototype.create = function() {
};
EPUBJS.View.prototype.lock = function(width, height) {
EPUBJS.View.prototype.lock = function(what, width, height) {
var elBorders = EPUBJS.core.borders(this.element);
var iframeBorders;
@ -89,17 +89,18 @@ EPUBJS.View.prototype.lock = function(width, height) {
iframeBorders = {width: 0, height: 0};
}
if(EPUBJS.core.isNumber(width)){
if(what == "width" && EPUBJS.core.isNumber(width)){
this.lockedWidth = width - elBorders.width - iframeBorders.width;
this.resize(this.lockedWidth, width); // width keeps ratio correct
}
if(EPUBJS.core.isNumber(height)){
if(what == "height" && EPUBJS.core.isNumber(height)){
this.lockedHeight = height - elBorders.height - iframeBorders.height;
this.resize(null, this.lockedHeight);
this.resize(width, this.lockedHeight);
}
if(EPUBJS.core.isNumber(width) &&
if(what === "both" &&
EPUBJS.core.isNumber(width) &&
EPUBJS.core.isNumber(height)){
this.lockedWidth = width - elBorders.width - iframeBorders.width;