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 pageMap regenration after reformat

Browse source
This commit is contained in:
Fred Chasen 2014-09-18 00:36:37 -04:00
parent 3598484538
commit 41f4a1335c
11 changed files with 118 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

48
build/epub.js
View file

@ -3328,10 +3328,10 @@ EPUBJS.Book.prototype.setStyle = function(style, val, prefixed) {
this.renderer.setStyle(style, val, prefixed);
if(noreflow.indexOf(style) === -1) {
clearTimeout(this.reformatTimeout);
this.reformatTimeout = setTimeout(function(){
this.renderer.reformat();
}.bind(this), 10);
// clearTimeout(this.reformatTimeout);
// this.reformatTimeout = setTimeout(function(){
this.renderer.reformat();
// }.bind(this), 10);
}
};
@ -3356,9 +3356,11 @@ EPUBJS.Book.prototype.useSpreads = function(use) {
}
};
EPUBJS.Book.prototype.forceSingle = function(use) {
this.renderer.forceSingle(use);
this.settings.forceSingle = use;
EPUBJS.Book.prototype.forceSingle = function(_use) {
var force = typeof _use === "undefined" ? true : _use;
this.renderer.forceSingle(force);
this.settings.forceSingle = force;
if(this.isRendered) {
this.renderer.reformat();
}
@ -5072,7 +5074,8 @@ EPUBJS.Layout.ReflowableSpreads.prototype.calculatePages = function() {
var displayedPages = Math.ceil(totalWidth / this.spreadWidth);
//-- Add a page to the width of the document to account an for odd number of pages
this.documentElement.style.width = totalWidth + this.spreadWidth + "px";
this.documentElement.style.width = ((displayedPages * this.spreadWidth) - this.gap) + "px";
return {
displayedPages : displayedPages,
pageCount : displayedPages * 2
@ -6213,28 +6216,33 @@ EPUBJS.Renderer.prototype.reformat = function(){
if(!this.contents) return;
spreads = this.determineSpreads(this.minSpreadWidth);
// Only re-layout if the spreads have switched
if(spreads != this.spreads){
this.spreads = spreads;
this.layoutMethod = this.determineLayout(this.layoutSettings);
this.layout = new EPUBJS.Layout[this.layoutMethod]();
}
// Reset pages
this.chapterPos = 1;
this.render.page(1);
this.formated = this.layout.format(this.contents, this.render.width, this.render.height, this.gap);
this.render.setPageDimensions(this.formated.pageWidth, this.formated.pageHeight);
// Give the css styles time to update
// clearTimeout(this.timeoutTillCfi);
// this.timeoutTillCfi = setTimeout(function(){
renderer.formated = renderer.layout.format(renderer.contents, renderer.render.width, renderer.render.height, renderer.gap);
renderer.render.setPageDimensions(renderer.formated.pageWidth, renderer.formated.pageHeight);
pages = renderer.layout.calculatePages();
renderer.updatePages(pages);
// Give the css styles time to update
clearTimeout(this.timeoutTillCfi);
this.timeoutTillCfi = setTimeout(function(){
//-- Go to current page after formating
if(renderer.currentLocationCfi){
renderer.gotoCfi(renderer.currentLocationCfi);
}
this.timeoutTillCfi = null;
}, 10);
//-- Go to current page after formating
if(renderer.currentLocationCfi){
renderer.gotoCfi(renderer.currentLocationCfi);
}
// renderer.timeoutTillCfi = null;
};

2
build/epub.js.map
View file

File diff suppressed because one or more lines are too long

4
build/epub.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
build/epub.min.map
View file

File diff suppressed because one or more lines are too long

48
build/epub_no_underscore.js
View file

@ -3327,10 +3327,10 @@ EPUBJS.Book.prototype.setStyle = function(style, val, prefixed) {
this.renderer.setStyle(style, val, prefixed);
if(noreflow.indexOf(style) === -1) {
clearTimeout(this.reformatTimeout);
this.reformatTimeout = setTimeout(function(){
this.renderer.reformat();
}.bind(this), 10);
// clearTimeout(this.reformatTimeout);
// this.reformatTimeout = setTimeout(function(){
this.renderer.reformat();
// }.bind(this), 10);
}
};
@ -3355,9 +3355,11 @@ EPUBJS.Book.prototype.useSpreads = function(use) {
}
};
EPUBJS.Book.prototype.forceSingle = function(use) {
this.renderer.forceSingle(use);
this.settings.forceSingle = use;
EPUBJS.Book.prototype.forceSingle = function(_use) {
var force = typeof _use === "undefined" ? true : _use;
this.renderer.forceSingle(force);
this.settings.forceSingle = force;
if(this.isRendered) {
this.renderer.reformat();
}
@ -5071,7 +5073,8 @@ EPUBJS.Layout.ReflowableSpreads.prototype.calculatePages = function() {
var displayedPages = Math.ceil(totalWidth / this.spreadWidth);
//-- Add a page to the width of the document to account an for odd number of pages
this.documentElement.style.width = totalWidth + this.spreadWidth + "px";
this.documentElement.style.width = ((displayedPages * this.spreadWidth) - this.gap) + "px";
return {
displayedPages : displayedPages,
pageCount : displayedPages * 2
@ -6212,28 +6215,33 @@ EPUBJS.Renderer.prototype.reformat = function(){
if(!this.contents) return;
spreads = this.determineSpreads(this.minSpreadWidth);
// Only re-layout if the spreads have switched
if(spreads != this.spreads){
this.spreads = spreads;
this.layoutMethod = this.determineLayout(this.layoutSettings);
this.layout = new EPUBJS.Layout[this.layoutMethod]();
}
// Reset pages
this.chapterPos = 1;
this.render.page(1);
this.formated = this.layout.format(this.contents, this.render.width, this.render.height, this.gap);
this.render.setPageDimensions(this.formated.pageWidth, this.formated.pageHeight);
// Give the css styles time to update
// clearTimeout(this.timeoutTillCfi);
// this.timeoutTillCfi = setTimeout(function(){
renderer.formated = renderer.layout.format(renderer.contents, renderer.render.width, renderer.render.height, renderer.gap);
renderer.render.setPageDimensions(renderer.formated.pageWidth, renderer.formated.pageHeight);
pages = renderer.layout.calculatePages();
renderer.updatePages(pages);
// Give the css styles time to update
clearTimeout(this.timeoutTillCfi);
this.timeoutTillCfi = setTimeout(function(){
//-- Go to current page after formating
if(renderer.currentLocationCfi){
renderer.gotoCfi(renderer.currentLocationCfi);
}
this.timeoutTillCfi = null;
}, 10);
//-- Go to current page after formating
if(renderer.currentLocationCfi){
renderer.gotoCfi(renderer.currentLocationCfi);
}
// renderer.timeoutTillCfi = null;
};

2
build/epub_no_underscore.js.map
View file

File diff suppressed because one or more lines are too long

2
reader/js/epub.js.map
View file

File diff suppressed because one or more lines are too long

48
reader/js/epub.min.js vendored
View file

@ -3328,10 +3328,10 @@ EPUBJS.Book.prototype.setStyle = function(style, val, prefixed) {
this.renderer.setStyle(style, val, prefixed);
if(noreflow.indexOf(style) === -1) {
clearTimeout(this.reformatTimeout);
this.reformatTimeout = setTimeout(function(){
this.renderer.reformat();
}.bind(this), 10);
// clearTimeout(this.reformatTimeout);
// this.reformatTimeout = setTimeout(function(){
this.renderer.reformat();
// }.bind(this), 10);
}
};
@ -3356,9 +3356,11 @@ EPUBJS.Book.prototype.useSpreads = function(use) {
}
};
EPUBJS.Book.prototype.forceSingle = function(use) {
this.renderer.forceSingle(use);
this.settings.forceSingle = use;
EPUBJS.Book.prototype.forceSingle = function(_use) {
var force = typeof _use === "undefined" ? true : _use;
this.renderer.forceSingle(force);
this.settings.forceSingle = force;
if(this.isRendered) {
this.renderer.reformat();
}
@ -5072,7 +5074,8 @@ EPUBJS.Layout.ReflowableSpreads.prototype.calculatePages = function() {
var displayedPages = Math.ceil(totalWidth / this.spreadWidth);
//-- Add a page to the width of the document to account an for odd number of pages
this.documentElement.style.width = totalWidth + this.spreadWidth + "px";
this.documentElement.style.width = ((displayedPages * this.spreadWidth) - this.gap) + "px";
return {
displayedPages : displayedPages,
pageCount : displayedPages * 2
@ -6213,28 +6216,33 @@ EPUBJS.Renderer.prototype.reformat = function(){
if(!this.contents) return;
spreads = this.determineSpreads(this.minSpreadWidth);
// Only re-layout if the spreads have switched
if(spreads != this.spreads){
this.spreads = spreads;
this.layoutMethod = this.determineLayout(this.layoutSettings);
this.layout = new EPUBJS.Layout[this.layoutMethod]();
}
// Reset pages
this.chapterPos = 1;
this.render.page(1);
this.formated = this.layout.format(this.contents, this.render.width, this.render.height, this.gap);
this.render.setPageDimensions(this.formated.pageWidth, this.formated.pageHeight);
// Give the css styles time to update
// clearTimeout(this.timeoutTillCfi);
// this.timeoutTillCfi = setTimeout(function(){
renderer.formated = renderer.layout.format(renderer.contents, renderer.render.width, renderer.render.height, renderer.gap);
renderer.render.setPageDimensions(renderer.formated.pageWidth, renderer.formated.pageHeight);
pages = renderer.layout.calculatePages();
renderer.updatePages(pages);
// Give the css styles time to update
clearTimeout(this.timeoutTillCfi);
this.timeoutTillCfi = setTimeout(function(){
//-- Go to current page after formating
if(renderer.currentLocationCfi){
renderer.gotoCfi(renderer.currentLocationCfi);
}
this.timeoutTillCfi = null;
}, 10);
//-- Go to current page after formating
if(renderer.currentLocationCfi){
renderer.gotoCfi(renderer.currentLocationCfi);
}
// renderer.timeoutTillCfi = null;
};

16
src/book.js
View file

@ -1077,10 +1077,10 @@ EPUBJS.Book.prototype.setStyle = function(style, val, prefixed) {
this.renderer.setStyle(style, val, prefixed);
if(noreflow.indexOf(style) === -1) {
clearTimeout(this.reformatTimeout);
this.reformatTimeout = setTimeout(function(){
this.renderer.reformat();
}.bind(this), 10);
// clearTimeout(this.reformatTimeout);
// this.reformatTimeout = setTimeout(function(){
this.renderer.reformat();
// }.bind(this), 10);
}
};
@ -1105,9 +1105,11 @@ EPUBJS.Book.prototype.useSpreads = function(use) {
}
};
EPUBJS.Book.prototype.forceSingle = function(use) {
this.renderer.forceSingle(use);
this.settings.forceSingle = use;
EPUBJS.Book.prototype.forceSingle = function(_use) {
var force = typeof _use === "undefined" ? true : _use;
this.renderer.forceSingle(force);
this.settings.forceSingle = force;
if(this.isRendered) {
this.renderer.reformat();
}

3
src/layout.js
View file

@ -111,7 +111,8 @@ EPUBJS.Layout.ReflowableSpreads.prototype.calculatePages = function() {
var displayedPages = Math.ceil(totalWidth / this.spreadWidth);
//-- Add a page to the width of the document to account an for odd number of pages
this.documentElement.style.width = totalWidth + this.spreadWidth + "px";
this.documentElement.style.width = ((displayedPages * this.spreadWidth) - this.gap) + "px";
return {
displayedPages : displayedPages,
pageCount : displayedPages * 2

29
src/renderer.js
View file

@ -302,28 +302,33 @@ EPUBJS.Renderer.prototype.reformat = function(){
if(!this.contents) return;
spreads = this.determineSpreads(this.minSpreadWidth);
// Only re-layout if the spreads have switched
if(spreads != this.spreads){
this.spreads = spreads;
this.layoutMethod = this.determineLayout(this.layoutSettings);
this.layout = new EPUBJS.Layout[this.layoutMethod]();
}
// Reset pages
this.chapterPos = 1;
this.render.page(1);
this.formated = this.layout.format(this.contents, this.render.width, this.render.height, this.gap);
this.render.setPageDimensions(this.formated.pageWidth, this.formated.pageHeight);
// Give the css styles time to update
// clearTimeout(this.timeoutTillCfi);
// this.timeoutTillCfi = setTimeout(function(){
renderer.formated = renderer.layout.format(renderer.contents, renderer.render.width, renderer.render.height, renderer.gap);
renderer.render.setPageDimensions(renderer.formated.pageWidth, renderer.formated.pageHeight);
pages = renderer.layout.calculatePages();
renderer.updatePages(pages);
// Give the css styles time to update
clearTimeout(this.timeoutTillCfi);
this.timeoutTillCfi = setTimeout(function(){
//-- Go to current page after formating
if(renderer.currentLocationCfi){
renderer.gotoCfi(renderer.currentLocationCfi);
}
this.timeoutTillCfi = null;
}, 10);
//-- Go to current page after formating
if(renderer.currentLocationCfi){
renderer.gotoCfi(renderer.currentLocationCfi);
}
// renderer.timeoutTillCfi = null;
};