mirror of
https://github.com/futurepress/epub.js.git
synced 2025-10-03 14:59:18 +02:00
update cfi handling
This commit is contained in:
fchasen
parent
48612637d4
commit
b6c8d3ea7d
16 changed files with 727 additions and 291 deletions
2
books
2
books
|
|
@ -1 +1 @@
|
|||
Subproject commit ab9755a74714b647290c861f666515de220935d8
|
||||
Subproject commit 950c742b3d66cc7ac53bd0663a41315f001da1c4
|
||||
235
build/epub.js
235
build/epub.js
|
|
@ -2759,8 +2759,14 @@ EPUBJS.Book.prototype.listenToRenderer = function(renderer){
|
|||
// Prevents the Render from loading a different chapter when back button is pressed
|
||||
EPUBJS.Book.prototype.loadChange = function(url){
|
||||
var uri = EPUBJS.core.uri(url);
|
||||
if(!this._rendering && this.currentChapter && uri.path != this.currentChapter.absolute){
|
||||
// console.warn("Miss Match", uri.path, this.currentChapter.absolute);
|
||||
var chapter;
|
||||
|
||||
if(this.currentChapter) {
|
||||
chapter = EPUBJS.core.uri(this.currentChapter.absolute);
|
||||
}
|
||||
|
||||
if(!this._rendering && this.currentChapter && uri.path != chapter.path){
|
||||
console.warn("Miss Match", uri.path, this.currentChapter.absolute);
|
||||
this.goto(uri.filename);
|
||||
}
|
||||
};
|
||||
|
|
@ -2985,7 +2991,7 @@ EPUBJS.Book.prototype.displayChapter = function(chap, end, deferred){
|
|||
}
|
||||
|
||||
|
||||
if(this._rendering) {
|
||||
if(this._rendering || this._rendering) {
|
||||
// Pass along the current defer
|
||||
this._displayQ.enqueue("displayChapter", [chap, end, defer]);
|
||||
return defer.promise;
|
||||
|
|
@ -3011,23 +3017,18 @@ EPUBJS.Book.prototype.displayChapter = function(chap, end, deferred){
|
|||
this._rendering = true;
|
||||
|
||||
render = book.renderer.displayChapter(chapter, this.globalLayoutProperties);
|
||||
|
||||
if(cfi) {
|
||||
book.renderer.gotoCfi(cfi);
|
||||
} else if(end) {
|
||||
book.renderer.lastPage();
|
||||
}
|
||||
//-- Success, Clear render queue
|
||||
render.then(function(rendered){
|
||||
// var inwait;
|
||||
//-- Set the book's spine position
|
||||
book.spinePos = pos;
|
||||
|
||||
if(cfi) {
|
||||
rendered.gotoCfi(cfi);
|
||||
defer.resolve(book.renderer);
|
||||
} else if(end) {
|
||||
rendered.lastPage();
|
||||
defer.resolve(book.renderer);
|
||||
} else {
|
||||
defer.resolve(book.renderer);
|
||||
}
|
||||
|
||||
defer.resolve(book.renderer);
|
||||
|
||||
if(!book.settings.fromStorage &&
|
||||
!book.settings.contained) {
|
||||
|
|
@ -3037,6 +3038,9 @@ EPUBJS.Book.prototype.displayChapter = function(chap, end, deferred){
|
|||
book.currentChapter = chapter;
|
||||
book._rendering = false;
|
||||
book._displayQ.dequeue();
|
||||
if(book._displayQ.length() === 0) {
|
||||
book._gotoQ.dequeue();
|
||||
}
|
||||
|
||||
}, function(error) {
|
||||
// handle errors in either of the two requests
|
||||
|
|
@ -3136,12 +3140,14 @@ EPUBJS.Book.prototype.gotoCfi = function(cfiString, defer){
|
|||
deferred = defer || new RSVP.defer();
|
||||
|
||||
if(!this.isRendered) {
|
||||
console.warn("Not yet Rendered");
|
||||
this.settings.previousLocationCfi = cfiString;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Currently going to a chapter
|
||||
if(this._moving) {
|
||||
if(this._moving || this._rendering) {
|
||||
console.warn("Renderer is moving");
|
||||
this._gotoQ.enqueue("gotoCfi", [cfiString, deferred]);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -3174,8 +3180,8 @@ EPUBJS.Book.prototype.gotoCfi = function(cfiString, defer){
|
|||
this.spinePos = spinePos;
|
||||
render = this.renderer.displayChapter(this.currentChapter, this.globalLayoutProperties);
|
||||
|
||||
this.renderer.gotoCfi(cfi);
|
||||
render.then(function(rendered){
|
||||
rendered.gotoCfi(cfi);
|
||||
this._moving = false;
|
||||
deferred.resolve(rendered.currentLocationCfi);
|
||||
}.bind(this));
|
||||
|
|
@ -3199,7 +3205,7 @@ EPUBJS.Book.prototype.gotoHref = function(url, defer){
|
|||
}
|
||||
|
||||
// Currently going to a chapter
|
||||
if(this._moving) {
|
||||
if(this._moving || this._rendering) {
|
||||
this._gotoQ.enqueue("gotoHref", [url, deferred]);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -3311,12 +3317,20 @@ EPUBJS.Book.prototype.fromStorage = function(stored) {
|
|||
*/
|
||||
|
||||
EPUBJS.Book.prototype.setStyle = function(style, val, prefixed) {
|
||||
var noreflow = ["color", "background", "background-color"];
|
||||
|
||||
if(!this.isRendered) return this._q.enqueue("setStyle", arguments);
|
||||
|
||||
this.settings.styles[style] = val;
|
||||
|
||||
this.renderer.setStyle(style, val, prefixed);
|
||||
this.renderer.reformat();
|
||||
|
||||
if(noreflow.indexOf(style) === -1) {
|
||||
clearTimeout(this.reformatTimeout);
|
||||
this.reformatTimeout = setTimeout(function(){
|
||||
this.renderer.reformat();
|
||||
}.bind(this), 10);
|
||||
}
|
||||
};
|
||||
|
||||
EPUBJS.Book.prototype.removeStyle = function(style) {
|
||||
|
|
@ -3570,8 +3584,8 @@ EPUBJS.Chapter.prototype.cfiFromRange = function(_range) {
|
|||
|
||||
// Check for Contents
|
||||
if(!this.contents) return;
|
||||
|
||||
startXpath = EPUBJS.core.getElementXPath(_range.startContainer);
|
||||
// console.log(startContainer)
|
||||
endXpath = EPUBJS.core.getElementXPath(_range.endContainer);
|
||||
startContainer = this.contents.evaluate(startXpath, this.contents, EPUBJS.core.nsResolver, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
|
||||
|
||||
|
|
@ -3580,7 +3594,6 @@ EPUBJS.Chapter.prototype.cfiFromRange = function(_range) {
|
|||
}
|
||||
|
||||
range = this.contents.createRange();
|
||||
|
||||
// Find Exact Range in original document
|
||||
if(startContainer) {
|
||||
try {
|
||||
|
|
@ -3589,7 +3602,7 @@ EPUBJS.Chapter.prototype.cfiFromRange = function(_range) {
|
|||
range.setEnd(endContainer, _range.endOffset);
|
||||
}
|
||||
} catch (e) {
|
||||
// console.log("missed");
|
||||
console.log("missed");
|
||||
startContainer = false;
|
||||
}
|
||||
|
||||
|
|
@ -3597,7 +3610,7 @@ EPUBJS.Chapter.prototype.cfiFromRange = function(_range) {
|
|||
|
||||
// Fuzzy Match
|
||||
if(!startContainer) {
|
||||
// console.log("not found, try fuzzy match");
|
||||
console.log("not found, try fuzzy match");
|
||||
cleanStartTextContent = EPUBJS.core.cleanStringForXpath(_range.startContainer.textContent);
|
||||
startXpath = "//text()[contains(.," + cleanStartTextContent + ")]";
|
||||
|
||||
|
|
@ -3755,6 +3768,7 @@ EPUBJS.core.uri = function(url){
|
|||
if(search != -1) {
|
||||
uri.search = url.slice(search + 1);
|
||||
url = url.slice(0, search);
|
||||
href = url;
|
||||
}
|
||||
|
||||
if(doubleSlash != -1) {
|
||||
|
|
@ -4029,11 +4043,12 @@ EPUBJS.core.queue = function(_scope){
|
|||
if(_q.length) {
|
||||
inwait = _q.shift();
|
||||
// Defer to any current tasks
|
||||
setTimeout(function(){
|
||||
scope[inwait.funcName].apply(inwait.context || scope, inwait.args);
|
||||
}, 0);
|
||||
// setTimeout(function(){
|
||||
scope[inwait.funcName].apply(inwait.context || scope, inwait.args);
|
||||
// }, 0);
|
||||
}
|
||||
};
|
||||
|
||||
// Run All
|
||||
var flush = function(){
|
||||
while(_q.length) {
|
||||
|
|
@ -4044,11 +4059,17 @@ EPUBJS.core.queue = function(_scope){
|
|||
var clear = function(){
|
||||
_q = [];
|
||||
};
|
||||
|
||||
var length = function(){
|
||||
return _q.length;
|
||||
};
|
||||
|
||||
return {
|
||||
"enqueue" : enqueue,
|
||||
"dequeue" : dequeue,
|
||||
"flush" : flush,
|
||||
"clear" : clear
|
||||
"clear" : clear,
|
||||
"length" : length
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -4067,16 +4088,20 @@ EPUBJS.core.getElementXPath = function(element) {
|
|||
EPUBJS.core.getElementTreeXPath = function(element) {
|
||||
var paths = [];
|
||||
var isXhtml = (element.ownerDocument.documentElement.getAttribute('xmlns') === "http://www.w3.org/1999/xhtml");
|
||||
var index, nodeName, tagName, pathIndex;
|
||||
|
||||
if(element.nodeType === 3){
|
||||
paths.push("text()");
|
||||
element = element.parentElement;
|
||||
if(element.nodeType === Node.TEXT_NODE){
|
||||
// index = Array.prototype.indexOf.call(element.parentNode.childNodes, element) + 1;
|
||||
index = EPUBJS.core.indexOfTextNode(element) + 1;
|
||||
|
||||
paths.push("text()["+index+"]");
|
||||
element = element.parentNode;
|
||||
}
|
||||
|
||||
// Use nodeName (instead of localName) so namespace prefix is included (if any).
|
||||
for (; element && element.nodeType == 1; element = element.parentNode)
|
||||
{
|
||||
var index = 0;
|
||||
index = 0;
|
||||
for (var sibling = element.previousSibling; sibling; sibling = sibling.previousSibling)
|
||||
{
|
||||
// Ignore document type declaration.
|
||||
|
|
@ -4087,9 +4112,9 @@ EPUBJS.core.getElementTreeXPath = function(element) {
|
|||
++index;
|
||||
}
|
||||
}
|
||||
var nodeName = element.nodeName.toLowerCase();
|
||||
var tagName = (isXhtml ? "xhtml:" + nodeName : nodeName);
|
||||
var pathIndex = (index ? "[" + (index+1) + "]" : "");
|
||||
nodeName = element.nodeName.toLowerCase();
|
||||
tagName = (isXhtml ? "xhtml:" + nodeName : nodeName);
|
||||
pathIndex = (index ? "[" + (index+1) + "]" : "");
|
||||
paths.splice(0, 0, tagName + pathIndex);
|
||||
}
|
||||
|
||||
|
|
@ -4119,6 +4144,22 @@ EPUBJS.core.cleanStringForXpath = function(str) {
|
|||
});
|
||||
return "concat(\'\'," + parts.join(",") + ")";
|
||||
};
|
||||
|
||||
EPUBJS.core.indexOfTextNode = function(textNode){
|
||||
var parent = textNode.parentElement;
|
||||
var children = parent.childNodes;
|
||||
var sib;
|
||||
var index = -1;
|
||||
for (var i = 0; i < children.length; i++) {
|
||||
sib = children[i];
|
||||
if(sib.nodeType === Node.TEXT_NODE){
|
||||
index++;
|
||||
}
|
||||
if(sib == textNode) break;
|
||||
}
|
||||
|
||||
return index;
|
||||
};
|
||||
EPUBJS.EpubCFI = function(cfiStr){
|
||||
if(cfiStr) return this.parse(cfiStr);
|
||||
};
|
||||
|
|
@ -4523,7 +4564,8 @@ EPUBJS.EpubCFI.prototype.generateCfiFromRange = function(range, base) {
|
|||
|
||||
if(start.nodeType === 3) { // text node
|
||||
startElement = start.parentElement;
|
||||
startIndex = 1 + (2 * Array.prototype.indexOf.call(startElement.childNodes, start));
|
||||
//startIndex = 1 + (2 * Array.prototype.indexOf.call(startElement.childNodes, start));
|
||||
startIndex = 1 + (2 * EPUBJS.core.indexOfTextNode(start));
|
||||
startSteps = this.pathTo(startElement);
|
||||
} else if(range.collapsed) {
|
||||
return this.generateCfiFromElement(start, base); // single element
|
||||
|
|
@ -4539,7 +4581,9 @@ EPUBJS.EpubCFI.prototype.generateCfiFromRange = function(range, base) {
|
|||
|
||||
if(end.nodeType === 3) { // text node
|
||||
endElement = end.parentElement;
|
||||
endIndex = 1 + (2 * Array.prototype.indexOf.call(endElement.childNodes, end));
|
||||
// endIndex = 1 + (2 * Array.prototype.indexOf.call(endElement.childNodes, end));
|
||||
endIndex = 1 + (2 * EPUBJS.core.indexOfTextNode(end));
|
||||
|
||||
endSteps = this.pathTo(endElement);
|
||||
} else {
|
||||
endSteps = this.pathTo(end);
|
||||
|
|
@ -4597,18 +4641,21 @@ EPUBJS.EpubCFI.prototype.generateRangeFromCfi = function(cfi, _doc) {
|
|||
// Get the terminal step
|
||||
lastStep = cfi.steps[cfi.steps.length-1];
|
||||
startContainer = doc.evaluate(xpath, doc, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
|
||||
|
||||
if(!startContainer) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if(startContainer && cfi.characterOffset >= 0) {
|
||||
textLength = startContainer.length;
|
||||
|
||||
if(cfi.characterOffset < textLength) {
|
||||
range.setStart(startContainer, cfi.characterOffset);
|
||||
range.setEnd(startContainer, textLength );
|
||||
} else {
|
||||
range.setStart(startContainer, cfi.characterOffset - 1 );
|
||||
range.setEnd(startContainer, cfi.characterOffset );
|
||||
console.debug("offset greater than length:", cfi.characterOffset, textLength);
|
||||
range.setStart(startContainer, textLength - 1 );
|
||||
range.setEnd(startContainer, textLength );
|
||||
}
|
||||
} else if(startContainer) {
|
||||
range.selectNode(startContainer);
|
||||
|
|
@ -4783,6 +4830,7 @@ EPUBJS.Layout.Reflowable.prototype.format = function(documentElement, _width, _h
|
|||
var columnAxis = EPUBJS.core.prefixed('columnAxis');
|
||||
var columnGap = EPUBJS.core.prefixed('columnGap');
|
||||
var columnWidth = EPUBJS.core.prefixed('columnWidth');
|
||||
var columnFill = EPUBJS.core.prefixed('columnFill');
|
||||
|
||||
//-- Check the width and create even width columns
|
||||
var width = Math.floor(_width);
|
||||
|
|
@ -4804,6 +4852,7 @@ EPUBJS.Layout.Reflowable.prototype.format = function(documentElement, _width, _h
|
|||
|
||||
//-- Add columns
|
||||
documentElement.style[columnAxis] = "horizontal";
|
||||
documentElement.style[columnFill] = "auto";
|
||||
documentElement.style[columnWidth] = width+"px";
|
||||
documentElement.style[columnGap] = gap+"px";
|
||||
this.colWidth = width;
|
||||
|
|
@ -4836,6 +4885,7 @@ EPUBJS.Layout.ReflowableSpreads.prototype.format = function(documentElement, _wi
|
|||
var columnAxis = EPUBJS.core.prefixed('columnAxis');
|
||||
var columnGap = EPUBJS.core.prefixed('columnGap');
|
||||
var columnWidth = EPUBJS.core.prefixed('columnWidth');
|
||||
var columnFill = EPUBJS.core.prefixed('columnFill');
|
||||
|
||||
var divisor = 2,
|
||||
cutoff = 800;
|
||||
|
|
@ -4864,8 +4914,10 @@ EPUBJS.Layout.ReflowableSpreads.prototype.format = function(documentElement, _wi
|
|||
|
||||
//-- Add columns
|
||||
documentElement.style[columnAxis] = "horizontal";
|
||||
documentElement.style[columnFill] = "auto";
|
||||
documentElement.style[columnGap] = gap+"px";
|
||||
documentElement.style[columnWidth] = colWidth+"px";
|
||||
|
||||
this.colWidth = colWidth;
|
||||
this.gap = gap;
|
||||
return {
|
||||
|
|
@ -5566,7 +5618,9 @@ EPUBJS.Render.Iframe.prototype.load = function(url){
|
|||
|
||||
EPUBJS.Render.Iframe.prototype.loaded = function(v){
|
||||
var url = this.iframe.contentWindow.location.href;
|
||||
this.trigger("render:loaded", url);
|
||||
if(url != "about:blank"){
|
||||
this.trigger("render:loaded", url);
|
||||
}
|
||||
};
|
||||
|
||||
// Resize the iframe to the given width and height
|
||||
|
|
@ -5739,7 +5793,7 @@ EPUBJS.Renderer = function(renderMethod, hidden) {
|
|||
|
||||
this.spreads = true;
|
||||
this.isForcedSingle = false;
|
||||
this.resized = _.throttle(this.onResized.bind(this), 10);
|
||||
this.resized = _.debounce(this.onResized.bind(this), 100);
|
||||
|
||||
this.layoutSettings = {};
|
||||
|
||||
|
|
@ -5753,6 +5807,8 @@ EPUBJS.Renderer = function(renderMethod, hidden) {
|
|||
//-- Queue up page changes if page map isn't ready
|
||||
this._q = EPUBJS.core.queue(this);
|
||||
|
||||
this._moving = false;
|
||||
|
||||
};
|
||||
|
||||
//-- Renderer events for listening
|
||||
|
|
@ -5805,6 +5861,11 @@ EPUBJS.Renderer.prototype.initialize = function(element, width, height){
|
|||
*/
|
||||
EPUBJS.Renderer.prototype.displayChapter = function(chapter, globalLayout){
|
||||
var store = false;
|
||||
if(this._moving) {
|
||||
console.error("Rendering In Progress");
|
||||
return;
|
||||
}
|
||||
this._moving = true;
|
||||
// Get the url string from the chapter (may be from storage)
|
||||
return chapter.url().
|
||||
then(function(url) {
|
||||
|
|
@ -5812,7 +5873,11 @@ EPUBJS.Renderer.prototype.displayChapter = function(chapter, globalLayout){
|
|||
// Unload the previous chapter listener
|
||||
if(this.currentChapter) {
|
||||
this.currentChapter.unload(); // Remove stored blobs
|
||||
this.render.window.removeEventListener("resize", this.resized);
|
||||
|
||||
if(this.render.window){
|
||||
this.render.window.removeEventListener("resize", this.resized);
|
||||
}
|
||||
|
||||
this.removeEventListeners();
|
||||
this.removeSelectionListeners();
|
||||
this.trigger("renderer:chapterUnloaded");
|
||||
|
|
@ -5823,7 +5888,6 @@ EPUBJS.Renderer.prototype.displayChapter = function(chapter, globalLayout){
|
|||
|
||||
this.currentChapter = chapter;
|
||||
this.chapterPos = 1;
|
||||
this.pageMap = null;
|
||||
this.currentChapterCfiBase = chapter.cfiBase;
|
||||
|
||||
this.layoutSettings = this.reconcileLayoutSettings(globalLayout, chapter.properties);
|
||||
|
|
@ -5861,11 +5925,11 @@ EPUBJS.Renderer.prototype.load = function(url){
|
|||
this.formated = this.layout.format(contents, this.render.width, this.render.height, this.gap);
|
||||
this.render.setPageDimensions(this.formated.pageWidth, this.formated.pageHeight);
|
||||
|
||||
// window.addEventListener("orientationchange", this.onResized.bind(this), false);
|
||||
if(!this.initWidth && !this.initHeight){
|
||||
this.render.window.addEventListener("resize", this.resized, false);
|
||||
}
|
||||
|
||||
|
||||
this.addEventListeners();
|
||||
this.addSelectionListeners();
|
||||
|
||||
|
|
@ -5873,14 +5937,20 @@ EPUBJS.Renderer.prototype.load = function(url){
|
|||
this.beforeDisplay(function(){
|
||||
var pages = this.layout.calculatePages();
|
||||
var msg = this.currentChapter;
|
||||
var queued = this._q.length();
|
||||
this._moving = false;
|
||||
|
||||
this.updatePages(pages);
|
||||
|
||||
this.visibleRangeCfi = this.getVisibleRangeCfi();
|
||||
this.currentLocationCfi = this.visibleRangeCfi.start;
|
||||
this.trigger("renderer:locationChanged", this.currentLocationCfi);
|
||||
this.trigger("renderer:visibleRangeChanged", this.visibleRangeCfi);
|
||||
|
||||
msg.cfi = this.currentLocationCfi;
|
||||
if(queued === 0) {
|
||||
this.trigger("renderer:locationChanged", this.currentLocationCfi);
|
||||
this.trigger("renderer:visibleRangeChanged", this.visibleRangeCfi);
|
||||
}
|
||||
|
||||
msg.cfi = this.currentLocationCfi; //TODO: why is this cfi passed to chapterDisplayed
|
||||
this.trigger("renderer:chapterDisplayed", msg);
|
||||
|
||||
this.visible(true);
|
||||
|
|
@ -5975,8 +6045,16 @@ EPUBJS.Renderer.prototype.beforeDisplay = function(callback, renderer){
|
|||
// Update the renderer with the information passed by the layout
|
||||
EPUBJS.Renderer.prototype.updatePages = function(layout){
|
||||
this.pageMap = this.mapPage();
|
||||
this.displayedPages = layout.displayedPages;
|
||||
this.currentChapter.pages = layout.pageCount;
|
||||
// this.displayedPages = layout.displayedPages;
|
||||
|
||||
if (this.spreads) {
|
||||
this.displayedPages = Math.ceil(this.pageMap.length / 2);
|
||||
} else {
|
||||
this.displayedPages = this.pageMap.length;
|
||||
}
|
||||
|
||||
// this.currentChapter.pages = layout.pageCount;
|
||||
this.currentChapter.pages = this.pageMap.length;
|
||||
|
||||
this._q.flush();
|
||||
};
|
||||
|
|
@ -5987,8 +6065,13 @@ EPUBJS.Renderer.prototype.reformat = function(){
|
|||
var formated, pages;
|
||||
if(!this.contents) return;
|
||||
|
||||
this.layoutMethod = this.determineLayout(this.layoutSettings);
|
||||
this.layout = new EPUBJS.Layout[this.layoutMethod]();
|
||||
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]();
|
||||
}
|
||||
|
||||
this.formated = this.layout.format(this.contents, this.render.width, this.render.height, this.gap);
|
||||
this.render.setPageDimensions(this.formated.pageWidth, this.formated.pageHeight);
|
||||
|
|
@ -6059,8 +6142,8 @@ EPUBJS.Renderer.prototype.applyHeadTags = function(headTags) {
|
|||
//-- NAVIGATION
|
||||
|
||||
EPUBJS.Renderer.prototype.page = function(pg){
|
||||
|
||||
if(!this.pageMap) {
|
||||
console.warn("pageMap not set, queuing");
|
||||
this._q.enqueue("page", arguments);
|
||||
return true;
|
||||
}
|
||||
|
|
@ -6117,6 +6200,10 @@ EPUBJS.Renderer.prototype.pageByElement = function(el){
|
|||
|
||||
// Jump to the last page of the chapter
|
||||
EPUBJS.Renderer.prototype.lastPage = function(){
|
||||
if(this._moving) {
|
||||
return this._q.enqueue("lastPage", arguments);
|
||||
}
|
||||
|
||||
this.page(this.displayedPages);
|
||||
};
|
||||
|
||||
|
|
@ -6231,7 +6318,7 @@ EPUBJS.Renderer.prototype.textSprint = function(root, func) {
|
|||
};
|
||||
|
||||
EPUBJS.Renderer.prototype.sprint = function(root, func) {
|
||||
var treeWalker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, false, false);
|
||||
var treeWalker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, null, false);
|
||||
var node;
|
||||
while ((node = treeWalker.nextNode())) {
|
||||
func(node);
|
||||
|
|
@ -6252,15 +6339,30 @@ EPUBJS.Renderer.prototype.mapPage = function(){
|
|||
var cfi;
|
||||
var check = function(node) {
|
||||
var elPos;
|
||||
var elRange;
|
||||
var children = Array.prototype.slice.call(node.childNodes);
|
||||
if (node.nodeType == Node.ELEMENT_NODE) {
|
||||
elPos = node.getBoundingClientRect();
|
||||
// elPos = node.getBoundingClientRect();
|
||||
elRange = document.createRange();
|
||||
elRange.selectNodeContents(node);
|
||||
elPos = elRange.getBoundingClientRect();
|
||||
|
||||
if(!elPos || (elPos.width === 0 && elPos.height === 0)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(elPos.left + elPos.width > elLimit) {
|
||||
//-- Element starts new Col
|
||||
if(elPos.left > elLimit) {
|
||||
children.forEach(function(node){
|
||||
if(node.nodeType == Node.TEXT_NODE &&
|
||||
node.textContent.trim().length) {
|
||||
checkText(node);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//-- Element Spans new Col
|
||||
if(elPos.right > elLimit) {
|
||||
children.forEach(function(node){
|
||||
if(node.nodeType == Node.TEXT_NODE &&
|
||||
node.textContent.trim().length) {
|
||||
|
|
@ -6299,6 +6401,7 @@ EPUBJS.Renderer.prototype.mapPage = function(){
|
|||
start: cfi,
|
||||
end: null
|
||||
});
|
||||
|
||||
page += 1;
|
||||
limit = (width * page) - offset;
|
||||
elLimit = limit;
|
||||
|
|
@ -6336,6 +6439,7 @@ EPUBJS.Renderer.prototype.mapPage = function(){
|
|||
ranges = null;
|
||||
range = null;
|
||||
root = null;
|
||||
|
||||
return map;
|
||||
};
|
||||
|
||||
|
|
@ -6560,7 +6664,7 @@ EPUBJS.Renderer.prototype.getVisibleRangeCfi = function(){
|
|||
}
|
||||
|
||||
if(!startRange) {
|
||||
console.warn("page range miss:", pg);
|
||||
console.warn("page range miss:", pg, this.pageMap);
|
||||
startRange = this.pageMap[this.pageMap.length-1];
|
||||
endRange = startRange;
|
||||
}
|
||||
|
|
@ -6577,6 +6681,10 @@ EPUBJS.Renderer.prototype.gotoCfi = function(cfi){
|
|||
var marker;
|
||||
var range;
|
||||
|
||||
if(this._moving){
|
||||
return this._q.enqueue("gotoCfi", arguments);
|
||||
}
|
||||
|
||||
if(_.isString(cfi)){
|
||||
cfi = this.epubcfi.parse(cfi);
|
||||
}
|
||||
|
|
@ -6651,13 +6759,7 @@ EPUBJS.Renderer.prototype.resize = function(width, height, setSize){
|
|||
this.render.resize(this.width, this.height);
|
||||
}
|
||||
|
||||
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]();
|
||||
}
|
||||
|
||||
|
||||
if(this.contents){
|
||||
this.reformat();
|
||||
|
|
@ -6679,7 +6781,9 @@ EPUBJS.Renderer.prototype.onResized = function(e) {
|
|||
};
|
||||
|
||||
EPUBJS.Renderer.prototype.addEventListeners = function(){
|
||||
|
||||
if(!this.render.document) {
|
||||
return;
|
||||
}
|
||||
this.listenedEvents.forEach(function(eventName){
|
||||
this.render.document.addEventListener(eventName, this.triggerEvent.bind(this), false);
|
||||
}, this);
|
||||
|
|
@ -6687,7 +6791,9 @@ EPUBJS.Renderer.prototype.addEventListeners = function(){
|
|||
};
|
||||
|
||||
EPUBJS.Renderer.prototype.removeEventListeners = function(){
|
||||
|
||||
if(!this.render.document) {
|
||||
return;
|
||||
}
|
||||
this.listenedEvents.forEach(function(eventName){
|
||||
this.render.document.removeEventListener(eventName, this.triggerEvent, false);
|
||||
}, this);
|
||||
|
|
@ -6704,6 +6810,9 @@ EPUBJS.Renderer.prototype.addSelectionListeners = function(){
|
|||
};
|
||||
|
||||
EPUBJS.Renderer.prototype.removeSelectionListeners = function(){
|
||||
if(!this.render.document) {
|
||||
return;
|
||||
}
|
||||
this.doc.removeEventListener("selectionchange", this.onSelectionChange, false);
|
||||
};
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
4
build/epub.min.js
vendored
4
build/epub.min.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -2758,8 +2758,14 @@ EPUBJS.Book.prototype.listenToRenderer = function(renderer){
|
|||
// Prevents the Render from loading a different chapter when back button is pressed
|
||||
EPUBJS.Book.prototype.loadChange = function(url){
|
||||
var uri = EPUBJS.core.uri(url);
|
||||
if(!this._rendering && this.currentChapter && uri.path != this.currentChapter.absolute){
|
||||
// console.warn("Miss Match", uri.path, this.currentChapter.absolute);
|
||||
var chapter;
|
||||
|
||||
if(this.currentChapter) {
|
||||
chapter = EPUBJS.core.uri(this.currentChapter.absolute);
|
||||
}
|
||||
|
||||
if(!this._rendering && this.currentChapter && uri.path != chapter.path){
|
||||
console.warn("Miss Match", uri.path, this.currentChapter.absolute);
|
||||
this.goto(uri.filename);
|
||||
}
|
||||
};
|
||||
|
|
@ -2984,7 +2990,7 @@ EPUBJS.Book.prototype.displayChapter = function(chap, end, deferred){
|
|||
}
|
||||
|
||||
|
||||
if(this._rendering) {
|
||||
if(this._rendering || this._rendering) {
|
||||
// Pass along the current defer
|
||||
this._displayQ.enqueue("displayChapter", [chap, end, defer]);
|
||||
return defer.promise;
|
||||
|
|
@ -3010,23 +3016,18 @@ EPUBJS.Book.prototype.displayChapter = function(chap, end, deferred){
|
|||
this._rendering = true;
|
||||
|
||||
render = book.renderer.displayChapter(chapter, this.globalLayoutProperties);
|
||||
|
||||
if(cfi) {
|
||||
book.renderer.gotoCfi(cfi);
|
||||
} else if(end) {
|
||||
book.renderer.lastPage();
|
||||
}
|
||||
//-- Success, Clear render queue
|
||||
render.then(function(rendered){
|
||||
// var inwait;
|
||||
//-- Set the book's spine position
|
||||
book.spinePos = pos;
|
||||
|
||||
if(cfi) {
|
||||
rendered.gotoCfi(cfi);
|
||||
defer.resolve(book.renderer);
|
||||
} else if(end) {
|
||||
rendered.lastPage();
|
||||
defer.resolve(book.renderer);
|
||||
} else {
|
||||
defer.resolve(book.renderer);
|
||||
}
|
||||
|
||||
defer.resolve(book.renderer);
|
||||
|
||||
if(!book.settings.fromStorage &&
|
||||
!book.settings.contained) {
|
||||
|
|
@ -3036,6 +3037,9 @@ EPUBJS.Book.prototype.displayChapter = function(chap, end, deferred){
|
|||
book.currentChapter = chapter;
|
||||
book._rendering = false;
|
||||
book._displayQ.dequeue();
|
||||
if(book._displayQ.length() === 0) {
|
||||
book._gotoQ.dequeue();
|
||||
}
|
||||
|
||||
}, function(error) {
|
||||
// handle errors in either of the two requests
|
||||
|
|
@ -3135,12 +3139,14 @@ EPUBJS.Book.prototype.gotoCfi = function(cfiString, defer){
|
|||
deferred = defer || new RSVP.defer();
|
||||
|
||||
if(!this.isRendered) {
|
||||
console.warn("Not yet Rendered");
|
||||
this.settings.previousLocationCfi = cfiString;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Currently going to a chapter
|
||||
if(this._moving) {
|
||||
if(this._moving || this._rendering) {
|
||||
console.warn("Renderer is moving");
|
||||
this._gotoQ.enqueue("gotoCfi", [cfiString, deferred]);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -3173,8 +3179,8 @@ EPUBJS.Book.prototype.gotoCfi = function(cfiString, defer){
|
|||
this.spinePos = spinePos;
|
||||
render = this.renderer.displayChapter(this.currentChapter, this.globalLayoutProperties);
|
||||
|
||||
this.renderer.gotoCfi(cfi);
|
||||
render.then(function(rendered){
|
||||
rendered.gotoCfi(cfi);
|
||||
this._moving = false;
|
||||
deferred.resolve(rendered.currentLocationCfi);
|
||||
}.bind(this));
|
||||
|
|
@ -3198,7 +3204,7 @@ EPUBJS.Book.prototype.gotoHref = function(url, defer){
|
|||
}
|
||||
|
||||
// Currently going to a chapter
|
||||
if(this._moving) {
|
||||
if(this._moving || this._rendering) {
|
||||
this._gotoQ.enqueue("gotoHref", [url, deferred]);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -3310,12 +3316,20 @@ EPUBJS.Book.prototype.fromStorage = function(stored) {
|
|||
*/
|
||||
|
||||
EPUBJS.Book.prototype.setStyle = function(style, val, prefixed) {
|
||||
var noreflow = ["color", "background", "background-color"];
|
||||
|
||||
if(!this.isRendered) return this._q.enqueue("setStyle", arguments);
|
||||
|
||||
this.settings.styles[style] = val;
|
||||
|
||||
this.renderer.setStyle(style, val, prefixed);
|
||||
this.renderer.reformat();
|
||||
|
||||
if(noreflow.indexOf(style) === -1) {
|
||||
clearTimeout(this.reformatTimeout);
|
||||
this.reformatTimeout = setTimeout(function(){
|
||||
this.renderer.reformat();
|
||||
}.bind(this), 10);
|
||||
}
|
||||
};
|
||||
|
||||
EPUBJS.Book.prototype.removeStyle = function(style) {
|
||||
|
|
@ -3569,8 +3583,8 @@ EPUBJS.Chapter.prototype.cfiFromRange = function(_range) {
|
|||
|
||||
// Check for Contents
|
||||
if(!this.contents) return;
|
||||
|
||||
startXpath = EPUBJS.core.getElementXPath(_range.startContainer);
|
||||
// console.log(startContainer)
|
||||
endXpath = EPUBJS.core.getElementXPath(_range.endContainer);
|
||||
startContainer = this.contents.evaluate(startXpath, this.contents, EPUBJS.core.nsResolver, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
|
||||
|
||||
|
|
@ -3579,7 +3593,6 @@ EPUBJS.Chapter.prototype.cfiFromRange = function(_range) {
|
|||
}
|
||||
|
||||
range = this.contents.createRange();
|
||||
|
||||
// Find Exact Range in original document
|
||||
if(startContainer) {
|
||||
try {
|
||||
|
|
@ -3588,7 +3601,7 @@ EPUBJS.Chapter.prototype.cfiFromRange = function(_range) {
|
|||
range.setEnd(endContainer, _range.endOffset);
|
||||
}
|
||||
} catch (e) {
|
||||
// console.log("missed");
|
||||
console.log("missed");
|
||||
startContainer = false;
|
||||
}
|
||||
|
||||
|
|
@ -3596,7 +3609,7 @@ EPUBJS.Chapter.prototype.cfiFromRange = function(_range) {
|
|||
|
||||
// Fuzzy Match
|
||||
if(!startContainer) {
|
||||
// console.log("not found, try fuzzy match");
|
||||
console.log("not found, try fuzzy match");
|
||||
cleanStartTextContent = EPUBJS.core.cleanStringForXpath(_range.startContainer.textContent);
|
||||
startXpath = "//text()[contains(.," + cleanStartTextContent + ")]";
|
||||
|
||||
|
|
@ -3754,6 +3767,7 @@ EPUBJS.core.uri = function(url){
|
|||
if(search != -1) {
|
||||
uri.search = url.slice(search + 1);
|
||||
url = url.slice(0, search);
|
||||
href = url;
|
||||
}
|
||||
|
||||
if(doubleSlash != -1) {
|
||||
|
|
@ -4028,11 +4042,12 @@ EPUBJS.core.queue = function(_scope){
|
|||
if(_q.length) {
|
||||
inwait = _q.shift();
|
||||
// Defer to any current tasks
|
||||
setTimeout(function(){
|
||||
scope[inwait.funcName].apply(inwait.context || scope, inwait.args);
|
||||
}, 0);
|
||||
// setTimeout(function(){
|
||||
scope[inwait.funcName].apply(inwait.context || scope, inwait.args);
|
||||
// }, 0);
|
||||
}
|
||||
};
|
||||
|
||||
// Run All
|
||||
var flush = function(){
|
||||
while(_q.length) {
|
||||
|
|
@ -4043,11 +4058,17 @@ EPUBJS.core.queue = function(_scope){
|
|||
var clear = function(){
|
||||
_q = [];
|
||||
};
|
||||
|
||||
var length = function(){
|
||||
return _q.length;
|
||||
};
|
||||
|
||||
return {
|
||||
"enqueue" : enqueue,
|
||||
"dequeue" : dequeue,
|
||||
"flush" : flush,
|
||||
"clear" : clear
|
||||
"clear" : clear,
|
||||
"length" : length
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -4066,16 +4087,20 @@ EPUBJS.core.getElementXPath = function(element) {
|
|||
EPUBJS.core.getElementTreeXPath = function(element) {
|
||||
var paths = [];
|
||||
var isXhtml = (element.ownerDocument.documentElement.getAttribute('xmlns') === "http://www.w3.org/1999/xhtml");
|
||||
var index, nodeName, tagName, pathIndex;
|
||||
|
||||
if(element.nodeType === 3){
|
||||
paths.push("text()");
|
||||
element = element.parentElement;
|
||||
if(element.nodeType === Node.TEXT_NODE){
|
||||
// index = Array.prototype.indexOf.call(element.parentNode.childNodes, element) + 1;
|
||||
index = EPUBJS.core.indexOfTextNode(element) + 1;
|
||||
|
||||
paths.push("text()["+index+"]");
|
||||
element = element.parentNode;
|
||||
}
|
||||
|
||||
// Use nodeName (instead of localName) so namespace prefix is included (if any).
|
||||
for (; element && element.nodeType == 1; element = element.parentNode)
|
||||
{
|
||||
var index = 0;
|
||||
index = 0;
|
||||
for (var sibling = element.previousSibling; sibling; sibling = sibling.previousSibling)
|
||||
{
|
||||
// Ignore document type declaration.
|
||||
|
|
@ -4086,9 +4111,9 @@ EPUBJS.core.getElementTreeXPath = function(element) {
|
|||
++index;
|
||||
}
|
||||
}
|
||||
var nodeName = element.nodeName.toLowerCase();
|
||||
var tagName = (isXhtml ? "xhtml:" + nodeName : nodeName);
|
||||
var pathIndex = (index ? "[" + (index+1) + "]" : "");
|
||||
nodeName = element.nodeName.toLowerCase();
|
||||
tagName = (isXhtml ? "xhtml:" + nodeName : nodeName);
|
||||
pathIndex = (index ? "[" + (index+1) + "]" : "");
|
||||
paths.splice(0, 0, tagName + pathIndex);
|
||||
}
|
||||
|
||||
|
|
@ -4118,6 +4143,22 @@ EPUBJS.core.cleanStringForXpath = function(str) {
|
|||
});
|
||||
return "concat(\'\'," + parts.join(",") + ")";
|
||||
};
|
||||
|
||||
EPUBJS.core.indexOfTextNode = function(textNode){
|
||||
var parent = textNode.parentElement;
|
||||
var children = parent.childNodes;
|
||||
var sib;
|
||||
var index = -1;
|
||||
for (var i = 0; i < children.length; i++) {
|
||||
sib = children[i];
|
||||
if(sib.nodeType === Node.TEXT_NODE){
|
||||
index++;
|
||||
}
|
||||
if(sib == textNode) break;
|
||||
}
|
||||
|
||||
return index;
|
||||
};
|
||||
EPUBJS.EpubCFI = function(cfiStr){
|
||||
if(cfiStr) return this.parse(cfiStr);
|
||||
};
|
||||
|
|
@ -4522,7 +4563,8 @@ EPUBJS.EpubCFI.prototype.generateCfiFromRange = function(range, base) {
|
|||
|
||||
if(start.nodeType === 3) { // text node
|
||||
startElement = start.parentElement;
|
||||
startIndex = 1 + (2 * Array.prototype.indexOf.call(startElement.childNodes, start));
|
||||
//startIndex = 1 + (2 * Array.prototype.indexOf.call(startElement.childNodes, start));
|
||||
startIndex = 1 + (2 * EPUBJS.core.indexOfTextNode(start));
|
||||
startSteps = this.pathTo(startElement);
|
||||
} else if(range.collapsed) {
|
||||
return this.generateCfiFromElement(start, base); // single element
|
||||
|
|
@ -4538,7 +4580,9 @@ EPUBJS.EpubCFI.prototype.generateCfiFromRange = function(range, base) {
|
|||
|
||||
if(end.nodeType === 3) { // text node
|
||||
endElement = end.parentElement;
|
||||
endIndex = 1 + (2 * Array.prototype.indexOf.call(endElement.childNodes, end));
|
||||
// endIndex = 1 + (2 * Array.prototype.indexOf.call(endElement.childNodes, end));
|
||||
endIndex = 1 + (2 * EPUBJS.core.indexOfTextNode(end));
|
||||
|
||||
endSteps = this.pathTo(endElement);
|
||||
} else {
|
||||
endSteps = this.pathTo(end);
|
||||
|
|
@ -4596,18 +4640,21 @@ EPUBJS.EpubCFI.prototype.generateRangeFromCfi = function(cfi, _doc) {
|
|||
// Get the terminal step
|
||||
lastStep = cfi.steps[cfi.steps.length-1];
|
||||
startContainer = doc.evaluate(xpath, doc, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
|
||||
|
||||
if(!startContainer) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if(startContainer && cfi.characterOffset >= 0) {
|
||||
textLength = startContainer.length;
|
||||
|
||||
if(cfi.characterOffset < textLength) {
|
||||
range.setStart(startContainer, cfi.characterOffset);
|
||||
range.setEnd(startContainer, textLength );
|
||||
} else {
|
||||
range.setStart(startContainer, cfi.characterOffset - 1 );
|
||||
range.setEnd(startContainer, cfi.characterOffset );
|
||||
console.debug("offset greater than length:", cfi.characterOffset, textLength);
|
||||
range.setStart(startContainer, textLength - 1 );
|
||||
range.setEnd(startContainer, textLength );
|
||||
}
|
||||
} else if(startContainer) {
|
||||
range.selectNode(startContainer);
|
||||
|
|
@ -4782,6 +4829,7 @@ EPUBJS.Layout.Reflowable.prototype.format = function(documentElement, _width, _h
|
|||
var columnAxis = EPUBJS.core.prefixed('columnAxis');
|
||||
var columnGap = EPUBJS.core.prefixed('columnGap');
|
||||
var columnWidth = EPUBJS.core.prefixed('columnWidth');
|
||||
var columnFill = EPUBJS.core.prefixed('columnFill');
|
||||
|
||||
//-- Check the width and create even width columns
|
||||
var width = Math.floor(_width);
|
||||
|
|
@ -4803,6 +4851,7 @@ EPUBJS.Layout.Reflowable.prototype.format = function(documentElement, _width, _h
|
|||
|
||||
//-- Add columns
|
||||
documentElement.style[columnAxis] = "horizontal";
|
||||
documentElement.style[columnFill] = "auto";
|
||||
documentElement.style[columnWidth] = width+"px";
|
||||
documentElement.style[columnGap] = gap+"px";
|
||||
this.colWidth = width;
|
||||
|
|
@ -4835,6 +4884,7 @@ EPUBJS.Layout.ReflowableSpreads.prototype.format = function(documentElement, _wi
|
|||
var columnAxis = EPUBJS.core.prefixed('columnAxis');
|
||||
var columnGap = EPUBJS.core.prefixed('columnGap');
|
||||
var columnWidth = EPUBJS.core.prefixed('columnWidth');
|
||||
var columnFill = EPUBJS.core.prefixed('columnFill');
|
||||
|
||||
var divisor = 2,
|
||||
cutoff = 800;
|
||||
|
|
@ -4863,8 +4913,10 @@ EPUBJS.Layout.ReflowableSpreads.prototype.format = function(documentElement, _wi
|
|||
|
||||
//-- Add columns
|
||||
documentElement.style[columnAxis] = "horizontal";
|
||||
documentElement.style[columnFill] = "auto";
|
||||
documentElement.style[columnGap] = gap+"px";
|
||||
documentElement.style[columnWidth] = colWidth+"px";
|
||||
|
||||
this.colWidth = colWidth;
|
||||
this.gap = gap;
|
||||
return {
|
||||
|
|
@ -5565,7 +5617,9 @@ EPUBJS.Render.Iframe.prototype.load = function(url){
|
|||
|
||||
EPUBJS.Render.Iframe.prototype.loaded = function(v){
|
||||
var url = this.iframe.contentWindow.location.href;
|
||||
this.trigger("render:loaded", url);
|
||||
if(url != "about:blank"){
|
||||
this.trigger("render:loaded", url);
|
||||
}
|
||||
};
|
||||
|
||||
// Resize the iframe to the given width and height
|
||||
|
|
@ -5738,7 +5792,7 @@ EPUBJS.Renderer = function(renderMethod, hidden) {
|
|||
|
||||
this.spreads = true;
|
||||
this.isForcedSingle = false;
|
||||
this.resized = _.throttle(this.onResized.bind(this), 10);
|
||||
this.resized = _.debounce(this.onResized.bind(this), 100);
|
||||
|
||||
this.layoutSettings = {};
|
||||
|
||||
|
|
@ -5752,6 +5806,8 @@ EPUBJS.Renderer = function(renderMethod, hidden) {
|
|||
//-- Queue up page changes if page map isn't ready
|
||||
this._q = EPUBJS.core.queue(this);
|
||||
|
||||
this._moving = false;
|
||||
|
||||
};
|
||||
|
||||
//-- Renderer events for listening
|
||||
|
|
@ -5804,6 +5860,11 @@ EPUBJS.Renderer.prototype.initialize = function(element, width, height){
|
|||
*/
|
||||
EPUBJS.Renderer.prototype.displayChapter = function(chapter, globalLayout){
|
||||
var store = false;
|
||||
if(this._moving) {
|
||||
console.error("Rendering In Progress");
|
||||
return;
|
||||
}
|
||||
this._moving = true;
|
||||
// Get the url string from the chapter (may be from storage)
|
||||
return chapter.url().
|
||||
then(function(url) {
|
||||
|
|
@ -5811,7 +5872,11 @@ EPUBJS.Renderer.prototype.displayChapter = function(chapter, globalLayout){
|
|||
// Unload the previous chapter listener
|
||||
if(this.currentChapter) {
|
||||
this.currentChapter.unload(); // Remove stored blobs
|
||||
this.render.window.removeEventListener("resize", this.resized);
|
||||
|
||||
if(this.render.window){
|
||||
this.render.window.removeEventListener("resize", this.resized);
|
||||
}
|
||||
|
||||
this.removeEventListeners();
|
||||
this.removeSelectionListeners();
|
||||
this.trigger("renderer:chapterUnloaded");
|
||||
|
|
@ -5822,7 +5887,6 @@ EPUBJS.Renderer.prototype.displayChapter = function(chapter, globalLayout){
|
|||
|
||||
this.currentChapter = chapter;
|
||||
this.chapterPos = 1;
|
||||
this.pageMap = null;
|
||||
this.currentChapterCfiBase = chapter.cfiBase;
|
||||
|
||||
this.layoutSettings = this.reconcileLayoutSettings(globalLayout, chapter.properties);
|
||||
|
|
@ -5860,11 +5924,11 @@ EPUBJS.Renderer.prototype.load = function(url){
|
|||
this.formated = this.layout.format(contents, this.render.width, this.render.height, this.gap);
|
||||
this.render.setPageDimensions(this.formated.pageWidth, this.formated.pageHeight);
|
||||
|
||||
// window.addEventListener("orientationchange", this.onResized.bind(this), false);
|
||||
if(!this.initWidth && !this.initHeight){
|
||||
this.render.window.addEventListener("resize", this.resized, false);
|
||||
}
|
||||
|
||||
|
||||
this.addEventListeners();
|
||||
this.addSelectionListeners();
|
||||
|
||||
|
|
@ -5872,14 +5936,20 @@ EPUBJS.Renderer.prototype.load = function(url){
|
|||
this.beforeDisplay(function(){
|
||||
var pages = this.layout.calculatePages();
|
||||
var msg = this.currentChapter;
|
||||
var queued = this._q.length();
|
||||
this._moving = false;
|
||||
|
||||
this.updatePages(pages);
|
||||
|
||||
this.visibleRangeCfi = this.getVisibleRangeCfi();
|
||||
this.currentLocationCfi = this.visibleRangeCfi.start;
|
||||
this.trigger("renderer:locationChanged", this.currentLocationCfi);
|
||||
this.trigger("renderer:visibleRangeChanged", this.visibleRangeCfi);
|
||||
|
||||
msg.cfi = this.currentLocationCfi;
|
||||
if(queued === 0) {
|
||||
this.trigger("renderer:locationChanged", this.currentLocationCfi);
|
||||
this.trigger("renderer:visibleRangeChanged", this.visibleRangeCfi);
|
||||
}
|
||||
|
||||
msg.cfi = this.currentLocationCfi; //TODO: why is this cfi passed to chapterDisplayed
|
||||
this.trigger("renderer:chapterDisplayed", msg);
|
||||
|
||||
this.visible(true);
|
||||
|
|
@ -5974,8 +6044,16 @@ EPUBJS.Renderer.prototype.beforeDisplay = function(callback, renderer){
|
|||
// Update the renderer with the information passed by the layout
|
||||
EPUBJS.Renderer.prototype.updatePages = function(layout){
|
||||
this.pageMap = this.mapPage();
|
||||
this.displayedPages = layout.displayedPages;
|
||||
this.currentChapter.pages = layout.pageCount;
|
||||
// this.displayedPages = layout.displayedPages;
|
||||
|
||||
if (this.spreads) {
|
||||
this.displayedPages = Math.ceil(this.pageMap.length / 2);
|
||||
} else {
|
||||
this.displayedPages = this.pageMap.length;
|
||||
}
|
||||
|
||||
// this.currentChapter.pages = layout.pageCount;
|
||||
this.currentChapter.pages = this.pageMap.length;
|
||||
|
||||
this._q.flush();
|
||||
};
|
||||
|
|
@ -5986,8 +6064,13 @@ EPUBJS.Renderer.prototype.reformat = function(){
|
|||
var formated, pages;
|
||||
if(!this.contents) return;
|
||||
|
||||
this.layoutMethod = this.determineLayout(this.layoutSettings);
|
||||
this.layout = new EPUBJS.Layout[this.layoutMethod]();
|
||||
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]();
|
||||
}
|
||||
|
||||
this.formated = this.layout.format(this.contents, this.render.width, this.render.height, this.gap);
|
||||
this.render.setPageDimensions(this.formated.pageWidth, this.formated.pageHeight);
|
||||
|
|
@ -6058,8 +6141,8 @@ EPUBJS.Renderer.prototype.applyHeadTags = function(headTags) {
|
|||
//-- NAVIGATION
|
||||
|
||||
EPUBJS.Renderer.prototype.page = function(pg){
|
||||
|
||||
if(!this.pageMap) {
|
||||
console.warn("pageMap not set, queuing");
|
||||
this._q.enqueue("page", arguments);
|
||||
return true;
|
||||
}
|
||||
|
|
@ -6116,6 +6199,10 @@ EPUBJS.Renderer.prototype.pageByElement = function(el){
|
|||
|
||||
// Jump to the last page of the chapter
|
||||
EPUBJS.Renderer.prototype.lastPage = function(){
|
||||
if(this._moving) {
|
||||
return this._q.enqueue("lastPage", arguments);
|
||||
}
|
||||
|
||||
this.page(this.displayedPages);
|
||||
};
|
||||
|
||||
|
|
@ -6230,7 +6317,7 @@ EPUBJS.Renderer.prototype.textSprint = function(root, func) {
|
|||
};
|
||||
|
||||
EPUBJS.Renderer.prototype.sprint = function(root, func) {
|
||||
var treeWalker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, false, false);
|
||||
var treeWalker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, null, false);
|
||||
var node;
|
||||
while ((node = treeWalker.nextNode())) {
|
||||
func(node);
|
||||
|
|
@ -6251,15 +6338,30 @@ EPUBJS.Renderer.prototype.mapPage = function(){
|
|||
var cfi;
|
||||
var check = function(node) {
|
||||
var elPos;
|
||||
var elRange;
|
||||
var children = Array.prototype.slice.call(node.childNodes);
|
||||
if (node.nodeType == Node.ELEMENT_NODE) {
|
||||
elPos = node.getBoundingClientRect();
|
||||
// elPos = node.getBoundingClientRect();
|
||||
elRange = document.createRange();
|
||||
elRange.selectNodeContents(node);
|
||||
elPos = elRange.getBoundingClientRect();
|
||||
|
||||
if(!elPos || (elPos.width === 0 && elPos.height === 0)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(elPos.left + elPos.width > elLimit) {
|
||||
//-- Element starts new Col
|
||||
if(elPos.left > elLimit) {
|
||||
children.forEach(function(node){
|
||||
if(node.nodeType == Node.TEXT_NODE &&
|
||||
node.textContent.trim().length) {
|
||||
checkText(node);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//-- Element Spans new Col
|
||||
if(elPos.right > elLimit) {
|
||||
children.forEach(function(node){
|
||||
if(node.nodeType == Node.TEXT_NODE &&
|
||||
node.textContent.trim().length) {
|
||||
|
|
@ -6298,6 +6400,7 @@ EPUBJS.Renderer.prototype.mapPage = function(){
|
|||
start: cfi,
|
||||
end: null
|
||||
});
|
||||
|
||||
page += 1;
|
||||
limit = (width * page) - offset;
|
||||
elLimit = limit;
|
||||
|
|
@ -6335,6 +6438,7 @@ EPUBJS.Renderer.prototype.mapPage = function(){
|
|||
ranges = null;
|
||||
range = null;
|
||||
root = null;
|
||||
|
||||
return map;
|
||||
};
|
||||
|
||||
|
|
@ -6559,7 +6663,7 @@ EPUBJS.Renderer.prototype.getVisibleRangeCfi = function(){
|
|||
}
|
||||
|
||||
if(!startRange) {
|
||||
console.warn("page range miss:", pg);
|
||||
console.warn("page range miss:", pg, this.pageMap);
|
||||
startRange = this.pageMap[this.pageMap.length-1];
|
||||
endRange = startRange;
|
||||
}
|
||||
|
|
@ -6576,6 +6680,10 @@ EPUBJS.Renderer.prototype.gotoCfi = function(cfi){
|
|||
var marker;
|
||||
var range;
|
||||
|
||||
if(this._moving){
|
||||
return this._q.enqueue("gotoCfi", arguments);
|
||||
}
|
||||
|
||||
if(_.isString(cfi)){
|
||||
cfi = this.epubcfi.parse(cfi);
|
||||
}
|
||||
|
|
@ -6650,13 +6758,7 @@ EPUBJS.Renderer.prototype.resize = function(width, height, setSize){
|
|||
this.render.resize(this.width, this.height);
|
||||
}
|
||||
|
||||
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]();
|
||||
}
|
||||
|
||||
|
||||
if(this.contents){
|
||||
this.reformat();
|
||||
|
|
@ -6678,7 +6780,9 @@ EPUBJS.Renderer.prototype.onResized = function(e) {
|
|||
};
|
||||
|
||||
EPUBJS.Renderer.prototype.addEventListeners = function(){
|
||||
|
||||
if(!this.render.document) {
|
||||
return;
|
||||
}
|
||||
this.listenedEvents.forEach(function(eventName){
|
||||
this.render.document.addEventListener(eventName, this.triggerEvent.bind(this), false);
|
||||
}, this);
|
||||
|
|
@ -6686,7 +6790,9 @@ EPUBJS.Renderer.prototype.addEventListeners = function(){
|
|||
};
|
||||
|
||||
EPUBJS.Renderer.prototype.removeEventListeners = function(){
|
||||
|
||||
if(!this.render.document) {
|
||||
return;
|
||||
}
|
||||
this.listenedEvents.forEach(function(eventName){
|
||||
this.render.document.removeEventListener(eventName, this.triggerEvent, false);
|
||||
}, this);
|
||||
|
|
@ -6703,6 +6809,9 @@ EPUBJS.Renderer.prototype.addSelectionListeners = function(){
|
|||
};
|
||||
|
||||
EPUBJS.Renderer.prototype.removeSelectionListeners = function(){
|
||||
if(!this.render.document) {
|
||||
return;
|
||||
}
|
||||
this.doc.removeEventListener("selectionchange", this.onSelectionChange, false);
|
||||
};
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
235
reader/js/epub.min.js
vendored
235
reader/js/epub.min.js
vendored
|
|
@ -2759,8 +2759,14 @@ EPUBJS.Book.prototype.listenToRenderer = function(renderer){
|
|||
// Prevents the Render from loading a different chapter when back button is pressed
|
||||
EPUBJS.Book.prototype.loadChange = function(url){
|
||||
var uri = EPUBJS.core.uri(url);
|
||||
if(!this._rendering && this.currentChapter && uri.path != this.currentChapter.absolute){
|
||||
// console.warn("Miss Match", uri.path, this.currentChapter.absolute);
|
||||
var chapter;
|
||||
|
||||
if(this.currentChapter) {
|
||||
chapter = EPUBJS.core.uri(this.currentChapter.absolute);
|
||||
}
|
||||
|
||||
if(!this._rendering && this.currentChapter && uri.path != chapter.path){
|
||||
console.warn("Miss Match", uri.path, this.currentChapter.absolute);
|
||||
this.goto(uri.filename);
|
||||
}
|
||||
};
|
||||
|
|
@ -2985,7 +2991,7 @@ EPUBJS.Book.prototype.displayChapter = function(chap, end, deferred){
|
|||
}
|
||||
|
||||
|
||||
if(this._rendering) {
|
||||
if(this._rendering || this._rendering) {
|
||||
// Pass along the current defer
|
||||
this._displayQ.enqueue("displayChapter", [chap, end, defer]);
|
||||
return defer.promise;
|
||||
|
|
@ -3011,23 +3017,18 @@ EPUBJS.Book.prototype.displayChapter = function(chap, end, deferred){
|
|||
this._rendering = true;
|
||||
|
||||
render = book.renderer.displayChapter(chapter, this.globalLayoutProperties);
|
||||
|
||||
if(cfi) {
|
||||
book.renderer.gotoCfi(cfi);
|
||||
} else if(end) {
|
||||
book.renderer.lastPage();
|
||||
}
|
||||
//-- Success, Clear render queue
|
||||
render.then(function(rendered){
|
||||
// var inwait;
|
||||
//-- Set the book's spine position
|
||||
book.spinePos = pos;
|
||||
|
||||
if(cfi) {
|
||||
rendered.gotoCfi(cfi);
|
||||
defer.resolve(book.renderer);
|
||||
} else if(end) {
|
||||
rendered.lastPage();
|
||||
defer.resolve(book.renderer);
|
||||
} else {
|
||||
defer.resolve(book.renderer);
|
||||
}
|
||||
|
||||
defer.resolve(book.renderer);
|
||||
|
||||
if(!book.settings.fromStorage &&
|
||||
!book.settings.contained) {
|
||||
|
|
@ -3037,6 +3038,9 @@ EPUBJS.Book.prototype.displayChapter = function(chap, end, deferred){
|
|||
book.currentChapter = chapter;
|
||||
book._rendering = false;
|
||||
book._displayQ.dequeue();
|
||||
if(book._displayQ.length() === 0) {
|
||||
book._gotoQ.dequeue();
|
||||
}
|
||||
|
||||
}, function(error) {
|
||||
// handle errors in either of the two requests
|
||||
|
|
@ -3136,12 +3140,14 @@ EPUBJS.Book.prototype.gotoCfi = function(cfiString, defer){
|
|||
deferred = defer || new RSVP.defer();
|
||||
|
||||
if(!this.isRendered) {
|
||||
console.warn("Not yet Rendered");
|
||||
this.settings.previousLocationCfi = cfiString;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Currently going to a chapter
|
||||
if(this._moving) {
|
||||
if(this._moving || this._rendering) {
|
||||
console.warn("Renderer is moving");
|
||||
this._gotoQ.enqueue("gotoCfi", [cfiString, deferred]);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -3174,8 +3180,8 @@ EPUBJS.Book.prototype.gotoCfi = function(cfiString, defer){
|
|||
this.spinePos = spinePos;
|
||||
render = this.renderer.displayChapter(this.currentChapter, this.globalLayoutProperties);
|
||||
|
||||
this.renderer.gotoCfi(cfi);
|
||||
render.then(function(rendered){
|
||||
rendered.gotoCfi(cfi);
|
||||
this._moving = false;
|
||||
deferred.resolve(rendered.currentLocationCfi);
|
||||
}.bind(this));
|
||||
|
|
@ -3199,7 +3205,7 @@ EPUBJS.Book.prototype.gotoHref = function(url, defer){
|
|||
}
|
||||
|
||||
// Currently going to a chapter
|
||||
if(this._moving) {
|
||||
if(this._moving || this._rendering) {
|
||||
this._gotoQ.enqueue("gotoHref", [url, deferred]);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -3311,12 +3317,20 @@ EPUBJS.Book.prototype.fromStorage = function(stored) {
|
|||
*/
|
||||
|
||||
EPUBJS.Book.prototype.setStyle = function(style, val, prefixed) {
|
||||
var noreflow = ["color", "background", "background-color"];
|
||||
|
||||
if(!this.isRendered) return this._q.enqueue("setStyle", arguments);
|
||||
|
||||
this.settings.styles[style] = val;
|
||||
|
||||
this.renderer.setStyle(style, val, prefixed);
|
||||
this.renderer.reformat();
|
||||
|
||||
if(noreflow.indexOf(style) === -1) {
|
||||
clearTimeout(this.reformatTimeout);
|
||||
this.reformatTimeout = setTimeout(function(){
|
||||
this.renderer.reformat();
|
||||
}.bind(this), 10);
|
||||
}
|
||||
};
|
||||
|
||||
EPUBJS.Book.prototype.removeStyle = function(style) {
|
||||
|
|
@ -3570,8 +3584,8 @@ EPUBJS.Chapter.prototype.cfiFromRange = function(_range) {
|
|||
|
||||
// Check for Contents
|
||||
if(!this.contents) return;
|
||||
|
||||
startXpath = EPUBJS.core.getElementXPath(_range.startContainer);
|
||||
// console.log(startContainer)
|
||||
endXpath = EPUBJS.core.getElementXPath(_range.endContainer);
|
||||
startContainer = this.contents.evaluate(startXpath, this.contents, EPUBJS.core.nsResolver, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
|
||||
|
||||
|
|
@ -3580,7 +3594,6 @@ EPUBJS.Chapter.prototype.cfiFromRange = function(_range) {
|
|||
}
|
||||
|
||||
range = this.contents.createRange();
|
||||
|
||||
// Find Exact Range in original document
|
||||
if(startContainer) {
|
||||
try {
|
||||
|
|
@ -3589,7 +3602,7 @@ EPUBJS.Chapter.prototype.cfiFromRange = function(_range) {
|
|||
range.setEnd(endContainer, _range.endOffset);
|
||||
}
|
||||
} catch (e) {
|
||||
// console.log("missed");
|
||||
console.log("missed");
|
||||
startContainer = false;
|
||||
}
|
||||
|
||||
|
|
@ -3597,7 +3610,7 @@ EPUBJS.Chapter.prototype.cfiFromRange = function(_range) {
|
|||
|
||||
// Fuzzy Match
|
||||
if(!startContainer) {
|
||||
// console.log("not found, try fuzzy match");
|
||||
console.log("not found, try fuzzy match");
|
||||
cleanStartTextContent = EPUBJS.core.cleanStringForXpath(_range.startContainer.textContent);
|
||||
startXpath = "//text()[contains(.," + cleanStartTextContent + ")]";
|
||||
|
||||
|
|
@ -3755,6 +3768,7 @@ EPUBJS.core.uri = function(url){
|
|||
if(search != -1) {
|
||||
uri.search = url.slice(search + 1);
|
||||
url = url.slice(0, search);
|
||||
href = url;
|
||||
}
|
||||
|
||||
if(doubleSlash != -1) {
|
||||
|
|
@ -4029,11 +4043,12 @@ EPUBJS.core.queue = function(_scope){
|
|||
if(_q.length) {
|
||||
inwait = _q.shift();
|
||||
// Defer to any current tasks
|
||||
setTimeout(function(){
|
||||
scope[inwait.funcName].apply(inwait.context || scope, inwait.args);
|
||||
}, 0);
|
||||
// setTimeout(function(){
|
||||
scope[inwait.funcName].apply(inwait.context || scope, inwait.args);
|
||||
// }, 0);
|
||||
}
|
||||
};
|
||||
|
||||
// Run All
|
||||
var flush = function(){
|
||||
while(_q.length) {
|
||||
|
|
@ -4044,11 +4059,17 @@ EPUBJS.core.queue = function(_scope){
|
|||
var clear = function(){
|
||||
_q = [];
|
||||
};
|
||||
|
||||
var length = function(){
|
||||
return _q.length;
|
||||
};
|
||||
|
||||
return {
|
||||
"enqueue" : enqueue,
|
||||
"dequeue" : dequeue,
|
||||
"flush" : flush,
|
||||
"clear" : clear
|
||||
"clear" : clear,
|
||||
"length" : length
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -4067,16 +4088,20 @@ EPUBJS.core.getElementXPath = function(element) {
|
|||
EPUBJS.core.getElementTreeXPath = function(element) {
|
||||
var paths = [];
|
||||
var isXhtml = (element.ownerDocument.documentElement.getAttribute('xmlns') === "http://www.w3.org/1999/xhtml");
|
||||
var index, nodeName, tagName, pathIndex;
|
||||
|
||||
if(element.nodeType === 3){
|
||||
paths.push("text()");
|
||||
element = element.parentElement;
|
||||
if(element.nodeType === Node.TEXT_NODE){
|
||||
// index = Array.prototype.indexOf.call(element.parentNode.childNodes, element) + 1;
|
||||
index = EPUBJS.core.indexOfTextNode(element) + 1;
|
||||
|
||||
paths.push("text()["+index+"]");
|
||||
element = element.parentNode;
|
||||
}
|
||||
|
||||
// Use nodeName (instead of localName) so namespace prefix is included (if any).
|
||||
for (; element && element.nodeType == 1; element = element.parentNode)
|
||||
{
|
||||
var index = 0;
|
||||
index = 0;
|
||||
for (var sibling = element.previousSibling; sibling; sibling = sibling.previousSibling)
|
||||
{
|
||||
// Ignore document type declaration.
|
||||
|
|
@ -4087,9 +4112,9 @@ EPUBJS.core.getElementTreeXPath = function(element) {
|
|||
++index;
|
||||
}
|
||||
}
|
||||
var nodeName = element.nodeName.toLowerCase();
|
||||
var tagName = (isXhtml ? "xhtml:" + nodeName : nodeName);
|
||||
var pathIndex = (index ? "[" + (index+1) + "]" : "");
|
||||
nodeName = element.nodeName.toLowerCase();
|
||||
tagName = (isXhtml ? "xhtml:" + nodeName : nodeName);
|
||||
pathIndex = (index ? "[" + (index+1) + "]" : "");
|
||||
paths.splice(0, 0, tagName + pathIndex);
|
||||
}
|
||||
|
||||
|
|
@ -4119,6 +4144,22 @@ EPUBJS.core.cleanStringForXpath = function(str) {
|
|||
});
|
||||
return "concat(\'\'," + parts.join(",") + ")";
|
||||
};
|
||||
|
||||
EPUBJS.core.indexOfTextNode = function(textNode){
|
||||
var parent = textNode.parentElement;
|
||||
var children = parent.childNodes;
|
||||
var sib;
|
||||
var index = -1;
|
||||
for (var i = 0; i < children.length; i++) {
|
||||
sib = children[i];
|
||||
if(sib.nodeType === Node.TEXT_NODE){
|
||||
index++;
|
||||
}
|
||||
if(sib == textNode) break;
|
||||
}
|
||||
|
||||
return index;
|
||||
};
|
||||
EPUBJS.EpubCFI = function(cfiStr){
|
||||
if(cfiStr) return this.parse(cfiStr);
|
||||
};
|
||||
|
|
@ -4523,7 +4564,8 @@ EPUBJS.EpubCFI.prototype.generateCfiFromRange = function(range, base) {
|
|||
|
||||
if(start.nodeType === 3) { // text node
|
||||
startElement = start.parentElement;
|
||||
startIndex = 1 + (2 * Array.prototype.indexOf.call(startElement.childNodes, start));
|
||||
//startIndex = 1 + (2 * Array.prototype.indexOf.call(startElement.childNodes, start));
|
||||
startIndex = 1 + (2 * EPUBJS.core.indexOfTextNode(start));
|
||||
startSteps = this.pathTo(startElement);
|
||||
} else if(range.collapsed) {
|
||||
return this.generateCfiFromElement(start, base); // single element
|
||||
|
|
@ -4539,7 +4581,9 @@ EPUBJS.EpubCFI.prototype.generateCfiFromRange = function(range, base) {
|
|||
|
||||
if(end.nodeType === 3) { // text node
|
||||
endElement = end.parentElement;
|
||||
endIndex = 1 + (2 * Array.prototype.indexOf.call(endElement.childNodes, end));
|
||||
// endIndex = 1 + (2 * Array.prototype.indexOf.call(endElement.childNodes, end));
|
||||
endIndex = 1 + (2 * EPUBJS.core.indexOfTextNode(end));
|
||||
|
||||
endSteps = this.pathTo(endElement);
|
||||
} else {
|
||||
endSteps = this.pathTo(end);
|
||||
|
|
@ -4597,18 +4641,21 @@ EPUBJS.EpubCFI.prototype.generateRangeFromCfi = function(cfi, _doc) {
|
|||
// Get the terminal step
|
||||
lastStep = cfi.steps[cfi.steps.length-1];
|
||||
startContainer = doc.evaluate(xpath, doc, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
|
||||
|
||||
if(!startContainer) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if(startContainer && cfi.characterOffset >= 0) {
|
||||
textLength = startContainer.length;
|
||||
|
||||
if(cfi.characterOffset < textLength) {
|
||||
range.setStart(startContainer, cfi.characterOffset);
|
||||
range.setEnd(startContainer, textLength );
|
||||
} else {
|
||||
range.setStart(startContainer, cfi.characterOffset - 1 );
|
||||
range.setEnd(startContainer, cfi.characterOffset );
|
||||
console.debug("offset greater than length:", cfi.characterOffset, textLength);
|
||||
range.setStart(startContainer, textLength - 1 );
|
||||
range.setEnd(startContainer, textLength );
|
||||
}
|
||||
} else if(startContainer) {
|
||||
range.selectNode(startContainer);
|
||||
|
|
@ -4783,6 +4830,7 @@ EPUBJS.Layout.Reflowable.prototype.format = function(documentElement, _width, _h
|
|||
var columnAxis = EPUBJS.core.prefixed('columnAxis');
|
||||
var columnGap = EPUBJS.core.prefixed('columnGap');
|
||||
var columnWidth = EPUBJS.core.prefixed('columnWidth');
|
||||
var columnFill = EPUBJS.core.prefixed('columnFill');
|
||||
|
||||
//-- Check the width and create even width columns
|
||||
var width = Math.floor(_width);
|
||||
|
|
@ -4804,6 +4852,7 @@ EPUBJS.Layout.Reflowable.prototype.format = function(documentElement, _width, _h
|
|||
|
||||
//-- Add columns
|
||||
documentElement.style[columnAxis] = "horizontal";
|
||||
documentElement.style[columnFill] = "auto";
|
||||
documentElement.style[columnWidth] = width+"px";
|
||||
documentElement.style[columnGap] = gap+"px";
|
||||
this.colWidth = width;
|
||||
|
|
@ -4836,6 +4885,7 @@ EPUBJS.Layout.ReflowableSpreads.prototype.format = function(documentElement, _wi
|
|||
var columnAxis = EPUBJS.core.prefixed('columnAxis');
|
||||
var columnGap = EPUBJS.core.prefixed('columnGap');
|
||||
var columnWidth = EPUBJS.core.prefixed('columnWidth');
|
||||
var columnFill = EPUBJS.core.prefixed('columnFill');
|
||||
|
||||
var divisor = 2,
|
||||
cutoff = 800;
|
||||
|
|
@ -4864,8 +4914,10 @@ EPUBJS.Layout.ReflowableSpreads.prototype.format = function(documentElement, _wi
|
|||
|
||||
//-- Add columns
|
||||
documentElement.style[columnAxis] = "horizontal";
|
||||
documentElement.style[columnFill] = "auto";
|
||||
documentElement.style[columnGap] = gap+"px";
|
||||
documentElement.style[columnWidth] = colWidth+"px";
|
||||
|
||||
this.colWidth = colWidth;
|
||||
this.gap = gap;
|
||||
return {
|
||||
|
|
@ -5566,7 +5618,9 @@ EPUBJS.Render.Iframe.prototype.load = function(url){
|
|||
|
||||
EPUBJS.Render.Iframe.prototype.loaded = function(v){
|
||||
var url = this.iframe.contentWindow.location.href;
|
||||
this.trigger("render:loaded", url);
|
||||
if(url != "about:blank"){
|
||||
this.trigger("render:loaded", url);
|
||||
}
|
||||
};
|
||||
|
||||
// Resize the iframe to the given width and height
|
||||
|
|
@ -5739,7 +5793,7 @@ EPUBJS.Renderer = function(renderMethod, hidden) {
|
|||
|
||||
this.spreads = true;
|
||||
this.isForcedSingle = false;
|
||||
this.resized = _.throttle(this.onResized.bind(this), 10);
|
||||
this.resized = _.debounce(this.onResized.bind(this), 100);
|
||||
|
||||
this.layoutSettings = {};
|
||||
|
||||
|
|
@ -5753,6 +5807,8 @@ EPUBJS.Renderer = function(renderMethod, hidden) {
|
|||
//-- Queue up page changes if page map isn't ready
|
||||
this._q = EPUBJS.core.queue(this);
|
||||
|
||||
this._moving = false;
|
||||
|
||||
};
|
||||
|
||||
//-- Renderer events for listening
|
||||
|
|
@ -5805,6 +5861,11 @@ EPUBJS.Renderer.prototype.initialize = function(element, width, height){
|
|||
*/
|
||||
EPUBJS.Renderer.prototype.displayChapter = function(chapter, globalLayout){
|
||||
var store = false;
|
||||
if(this._moving) {
|
||||
console.error("Rendering In Progress");
|
||||
return;
|
||||
}
|
||||
this._moving = true;
|
||||
// Get the url string from the chapter (may be from storage)
|
||||
return chapter.url().
|
||||
then(function(url) {
|
||||
|
|
@ -5812,7 +5873,11 @@ EPUBJS.Renderer.prototype.displayChapter = function(chapter, globalLayout){
|
|||
// Unload the previous chapter listener
|
||||
if(this.currentChapter) {
|
||||
this.currentChapter.unload(); // Remove stored blobs
|
||||
this.render.window.removeEventListener("resize", this.resized);
|
||||
|
||||
if(this.render.window){
|
||||
this.render.window.removeEventListener("resize", this.resized);
|
||||
}
|
||||
|
||||
this.removeEventListeners();
|
||||
this.removeSelectionListeners();
|
||||
this.trigger("renderer:chapterUnloaded");
|
||||
|
|
@ -5823,7 +5888,6 @@ EPUBJS.Renderer.prototype.displayChapter = function(chapter, globalLayout){
|
|||
|
||||
this.currentChapter = chapter;
|
||||
this.chapterPos = 1;
|
||||
this.pageMap = null;
|
||||
this.currentChapterCfiBase = chapter.cfiBase;
|
||||
|
||||
this.layoutSettings = this.reconcileLayoutSettings(globalLayout, chapter.properties);
|
||||
|
|
@ -5861,11 +5925,11 @@ EPUBJS.Renderer.prototype.load = function(url){
|
|||
this.formated = this.layout.format(contents, this.render.width, this.render.height, this.gap);
|
||||
this.render.setPageDimensions(this.formated.pageWidth, this.formated.pageHeight);
|
||||
|
||||
// window.addEventListener("orientationchange", this.onResized.bind(this), false);
|
||||
if(!this.initWidth && !this.initHeight){
|
||||
this.render.window.addEventListener("resize", this.resized, false);
|
||||
}
|
||||
|
||||
|
||||
this.addEventListeners();
|
||||
this.addSelectionListeners();
|
||||
|
||||
|
|
@ -5873,14 +5937,20 @@ EPUBJS.Renderer.prototype.load = function(url){
|
|||
this.beforeDisplay(function(){
|
||||
var pages = this.layout.calculatePages();
|
||||
var msg = this.currentChapter;
|
||||
var queued = this._q.length();
|
||||
this._moving = false;
|
||||
|
||||
this.updatePages(pages);
|
||||
|
||||
this.visibleRangeCfi = this.getVisibleRangeCfi();
|
||||
this.currentLocationCfi = this.visibleRangeCfi.start;
|
||||
this.trigger("renderer:locationChanged", this.currentLocationCfi);
|
||||
this.trigger("renderer:visibleRangeChanged", this.visibleRangeCfi);
|
||||
|
||||
msg.cfi = this.currentLocationCfi;
|
||||
if(queued === 0) {
|
||||
this.trigger("renderer:locationChanged", this.currentLocationCfi);
|
||||
this.trigger("renderer:visibleRangeChanged", this.visibleRangeCfi);
|
||||
}
|
||||
|
||||
msg.cfi = this.currentLocationCfi; //TODO: why is this cfi passed to chapterDisplayed
|
||||
this.trigger("renderer:chapterDisplayed", msg);
|
||||
|
||||
this.visible(true);
|
||||
|
|
@ -5975,8 +6045,16 @@ EPUBJS.Renderer.prototype.beforeDisplay = function(callback, renderer){
|
|||
// Update the renderer with the information passed by the layout
|
||||
EPUBJS.Renderer.prototype.updatePages = function(layout){
|
||||
this.pageMap = this.mapPage();
|
||||
this.displayedPages = layout.displayedPages;
|
||||
this.currentChapter.pages = layout.pageCount;
|
||||
// this.displayedPages = layout.displayedPages;
|
||||
|
||||
if (this.spreads) {
|
||||
this.displayedPages = Math.ceil(this.pageMap.length / 2);
|
||||
} else {
|
||||
this.displayedPages = this.pageMap.length;
|
||||
}
|
||||
|
||||
// this.currentChapter.pages = layout.pageCount;
|
||||
this.currentChapter.pages = this.pageMap.length;
|
||||
|
||||
this._q.flush();
|
||||
};
|
||||
|
|
@ -5987,8 +6065,13 @@ EPUBJS.Renderer.prototype.reformat = function(){
|
|||
var formated, pages;
|
||||
if(!this.contents) return;
|
||||
|
||||
this.layoutMethod = this.determineLayout(this.layoutSettings);
|
||||
this.layout = new EPUBJS.Layout[this.layoutMethod]();
|
||||
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]();
|
||||
}
|
||||
|
||||
this.formated = this.layout.format(this.contents, this.render.width, this.render.height, this.gap);
|
||||
this.render.setPageDimensions(this.formated.pageWidth, this.formated.pageHeight);
|
||||
|
|
@ -6059,8 +6142,8 @@ EPUBJS.Renderer.prototype.applyHeadTags = function(headTags) {
|
|||
//-- NAVIGATION
|
||||
|
||||
EPUBJS.Renderer.prototype.page = function(pg){
|
||||
|
||||
if(!this.pageMap) {
|
||||
console.warn("pageMap not set, queuing");
|
||||
this._q.enqueue("page", arguments);
|
||||
return true;
|
||||
}
|
||||
|
|
@ -6117,6 +6200,10 @@ EPUBJS.Renderer.prototype.pageByElement = function(el){
|
|||
|
||||
// Jump to the last page of the chapter
|
||||
EPUBJS.Renderer.prototype.lastPage = function(){
|
||||
if(this._moving) {
|
||||
return this._q.enqueue("lastPage", arguments);
|
||||
}
|
||||
|
||||
this.page(this.displayedPages);
|
||||
};
|
||||
|
||||
|
|
@ -6231,7 +6318,7 @@ EPUBJS.Renderer.prototype.textSprint = function(root, func) {
|
|||
};
|
||||
|
||||
EPUBJS.Renderer.prototype.sprint = function(root, func) {
|
||||
var treeWalker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, false, false);
|
||||
var treeWalker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, null, false);
|
||||
var node;
|
||||
while ((node = treeWalker.nextNode())) {
|
||||
func(node);
|
||||
|
|
@ -6252,15 +6339,30 @@ EPUBJS.Renderer.prototype.mapPage = function(){
|
|||
var cfi;
|
||||
var check = function(node) {
|
||||
var elPos;
|
||||
var elRange;
|
||||
var children = Array.prototype.slice.call(node.childNodes);
|
||||
if (node.nodeType == Node.ELEMENT_NODE) {
|
||||
elPos = node.getBoundingClientRect();
|
||||
// elPos = node.getBoundingClientRect();
|
||||
elRange = document.createRange();
|
||||
elRange.selectNodeContents(node);
|
||||
elPos = elRange.getBoundingClientRect();
|
||||
|
||||
if(!elPos || (elPos.width === 0 && elPos.height === 0)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(elPos.left + elPos.width > elLimit) {
|
||||
//-- Element starts new Col
|
||||
if(elPos.left > elLimit) {
|
||||
children.forEach(function(node){
|
||||
if(node.nodeType == Node.TEXT_NODE &&
|
||||
node.textContent.trim().length) {
|
||||
checkText(node);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//-- Element Spans new Col
|
||||
if(elPos.right > elLimit) {
|
||||
children.forEach(function(node){
|
||||
if(node.nodeType == Node.TEXT_NODE &&
|
||||
node.textContent.trim().length) {
|
||||
|
|
@ -6299,6 +6401,7 @@ EPUBJS.Renderer.prototype.mapPage = function(){
|
|||
start: cfi,
|
||||
end: null
|
||||
});
|
||||
|
||||
page += 1;
|
||||
limit = (width * page) - offset;
|
||||
elLimit = limit;
|
||||
|
|
@ -6336,6 +6439,7 @@ EPUBJS.Renderer.prototype.mapPage = function(){
|
|||
ranges = null;
|
||||
range = null;
|
||||
root = null;
|
||||
|
||||
return map;
|
||||
};
|
||||
|
||||
|
|
@ -6560,7 +6664,7 @@ EPUBJS.Renderer.prototype.getVisibleRangeCfi = function(){
|
|||
}
|
||||
|
||||
if(!startRange) {
|
||||
console.warn("page range miss:", pg);
|
||||
console.warn("page range miss:", pg, this.pageMap);
|
||||
startRange = this.pageMap[this.pageMap.length-1];
|
||||
endRange = startRange;
|
||||
}
|
||||
|
|
@ -6577,6 +6681,10 @@ EPUBJS.Renderer.prototype.gotoCfi = function(cfi){
|
|||
var marker;
|
||||
var range;
|
||||
|
||||
if(this._moving){
|
||||
return this._q.enqueue("gotoCfi", arguments);
|
||||
}
|
||||
|
||||
if(_.isString(cfi)){
|
||||
cfi = this.epubcfi.parse(cfi);
|
||||
}
|
||||
|
|
@ -6651,13 +6759,7 @@ EPUBJS.Renderer.prototype.resize = function(width, height, setSize){
|
|||
this.render.resize(this.width, this.height);
|
||||
}
|
||||
|
||||
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]();
|
||||
}
|
||||
|
||||
|
||||
if(this.contents){
|
||||
this.reformat();
|
||||
|
|
@ -6679,7 +6781,9 @@ EPUBJS.Renderer.prototype.onResized = function(e) {
|
|||
};
|
||||
|
||||
EPUBJS.Renderer.prototype.addEventListeners = function(){
|
||||
|
||||
if(!this.render.document) {
|
||||
return;
|
||||
}
|
||||
this.listenedEvents.forEach(function(eventName){
|
||||
this.render.document.addEventListener(eventName, this.triggerEvent.bind(this), false);
|
||||
}, this);
|
||||
|
|
@ -6687,7 +6791,9 @@ EPUBJS.Renderer.prototype.addEventListeners = function(){
|
|||
};
|
||||
|
||||
EPUBJS.Renderer.prototype.removeEventListeners = function(){
|
||||
|
||||
if(!this.render.document) {
|
||||
return;
|
||||
}
|
||||
this.listenedEvents.forEach(function(eventName){
|
||||
this.render.document.removeEventListener(eventName, this.triggerEvent, false);
|
||||
}, this);
|
||||
|
|
@ -6704,6 +6810,9 @@ EPUBJS.Renderer.prototype.addSelectionListeners = function(){
|
|||
};
|
||||
|
||||
EPUBJS.Renderer.prototype.removeSelectionListeners = function(){
|
||||
if(!this.render.document) {
|
||||
return;
|
||||
}
|
||||
this.doc.removeEventListener("selectionchange", this.onSelectionChange, false);
|
||||
};
|
||||
|
||||
|
|
|
|||
50
src/book.js
50
src/book.js
|
|
@ -509,8 +509,14 @@ EPUBJS.Book.prototype.listenToRenderer = function(renderer){
|
|||
// Prevents the Render from loading a different chapter when back button is pressed
|
||||
EPUBJS.Book.prototype.loadChange = function(url){
|
||||
var uri = EPUBJS.core.uri(url);
|
||||
if(!this._rendering && this.currentChapter && uri.path != this.currentChapter.absolute){
|
||||
// console.warn("Miss Match", uri.path, this.currentChapter.absolute);
|
||||
var chapter;
|
||||
|
||||
if(this.currentChapter) {
|
||||
chapter = EPUBJS.core.uri(this.currentChapter.absolute);
|
||||
}
|
||||
|
||||
if(!this._rendering && this.currentChapter && uri.path != chapter.path){
|
||||
console.warn("Miss Match", uri.path, this.currentChapter.absolute);
|
||||
this.goto(uri.filename);
|
||||
}
|
||||
};
|
||||
|
|
@ -735,7 +741,7 @@ EPUBJS.Book.prototype.displayChapter = function(chap, end, deferred){
|
|||
}
|
||||
|
||||
|
||||
if(this._rendering) {
|
||||
if(this._rendering || this._rendering) {
|
||||
// Pass along the current defer
|
||||
this._displayQ.enqueue("displayChapter", [chap, end, defer]);
|
||||
return defer.promise;
|
||||
|
|
@ -761,23 +767,18 @@ EPUBJS.Book.prototype.displayChapter = function(chap, end, deferred){
|
|||
this._rendering = true;
|
||||
|
||||
render = book.renderer.displayChapter(chapter, this.globalLayoutProperties);
|
||||
|
||||
if(cfi) {
|
||||
book.renderer.gotoCfi(cfi);
|
||||
} else if(end) {
|
||||
book.renderer.lastPage();
|
||||
}
|
||||
//-- Success, Clear render queue
|
||||
render.then(function(rendered){
|
||||
// var inwait;
|
||||
//-- Set the book's spine position
|
||||
book.spinePos = pos;
|
||||
|
||||
if(cfi) {
|
||||
rendered.gotoCfi(cfi);
|
||||
defer.resolve(book.renderer);
|
||||
} else if(end) {
|
||||
rendered.lastPage();
|
||||
defer.resolve(book.renderer);
|
||||
} else {
|
||||
defer.resolve(book.renderer);
|
||||
}
|
||||
|
||||
defer.resolve(book.renderer);
|
||||
|
||||
if(!book.settings.fromStorage &&
|
||||
!book.settings.contained) {
|
||||
|
|
@ -787,6 +788,9 @@ EPUBJS.Book.prototype.displayChapter = function(chap, end, deferred){
|
|||
book.currentChapter = chapter;
|
||||
book._rendering = false;
|
||||
book._displayQ.dequeue();
|
||||
if(book._displayQ.length() === 0) {
|
||||
book._gotoQ.dequeue();
|
||||
}
|
||||
|
||||
}, function(error) {
|
||||
// handle errors in either of the two requests
|
||||
|
|
@ -886,12 +890,14 @@ EPUBJS.Book.prototype.gotoCfi = function(cfiString, defer){
|
|||
deferred = defer || new RSVP.defer();
|
||||
|
||||
if(!this.isRendered) {
|
||||
console.warn("Not yet Rendered");
|
||||
this.settings.previousLocationCfi = cfiString;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Currently going to a chapter
|
||||
if(this._moving) {
|
||||
if(this._moving || this._rendering) {
|
||||
console.warn("Renderer is moving");
|
||||
this._gotoQ.enqueue("gotoCfi", [cfiString, deferred]);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -924,8 +930,8 @@ EPUBJS.Book.prototype.gotoCfi = function(cfiString, defer){
|
|||
this.spinePos = spinePos;
|
||||
render = this.renderer.displayChapter(this.currentChapter, this.globalLayoutProperties);
|
||||
|
||||
this.renderer.gotoCfi(cfi);
|
||||
render.then(function(rendered){
|
||||
rendered.gotoCfi(cfi);
|
||||
this._moving = false;
|
||||
deferred.resolve(rendered.currentLocationCfi);
|
||||
}.bind(this));
|
||||
|
|
@ -949,7 +955,7 @@ EPUBJS.Book.prototype.gotoHref = function(url, defer){
|
|||
}
|
||||
|
||||
// Currently going to a chapter
|
||||
if(this._moving) {
|
||||
if(this._moving || this._rendering) {
|
||||
this._gotoQ.enqueue("gotoHref", [url, deferred]);
|
||||
return false;
|
||||
}
|
||||
|
|
@ -1061,12 +1067,20 @@ EPUBJS.Book.prototype.fromStorage = function(stored) {
|
|||
*/
|
||||
|
||||
EPUBJS.Book.prototype.setStyle = function(style, val, prefixed) {
|
||||
var noreflow = ["color", "background", "background-color"];
|
||||
|
||||
if(!this.isRendered) return this._q.enqueue("setStyle", arguments);
|
||||
|
||||
this.settings.styles[style] = val;
|
||||
|
||||
this.renderer.setStyle(style, val, prefixed);
|
||||
this.renderer.reformat();
|
||||
|
||||
if(noreflow.indexOf(style) === -1) {
|
||||
clearTimeout(this.reformatTimeout);
|
||||
this.reformatTimeout = setTimeout(function(){
|
||||
this.renderer.reformat();
|
||||
}.bind(this), 10);
|
||||
}
|
||||
};
|
||||
|
||||
EPUBJS.Book.prototype.removeStyle = function(style) {
|
||||
|
|
|
|||
|
|
@ -86,8 +86,8 @@ EPUBJS.Chapter.prototype.cfiFromRange = function(_range) {
|
|||
|
||||
// Check for Contents
|
||||
if(!this.contents) return;
|
||||
|
||||
startXpath = EPUBJS.core.getElementXPath(_range.startContainer);
|
||||
// console.log(startContainer)
|
||||
endXpath = EPUBJS.core.getElementXPath(_range.endContainer);
|
||||
startContainer = this.contents.evaluate(startXpath, this.contents, EPUBJS.core.nsResolver, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
|
||||
|
||||
|
|
@ -96,7 +96,6 @@ EPUBJS.Chapter.prototype.cfiFromRange = function(_range) {
|
|||
}
|
||||
|
||||
range = this.contents.createRange();
|
||||
|
||||
// Find Exact Range in original document
|
||||
if(startContainer) {
|
||||
try {
|
||||
|
|
@ -105,7 +104,7 @@ EPUBJS.Chapter.prototype.cfiFromRange = function(_range) {
|
|||
range.setEnd(endContainer, _range.endOffset);
|
||||
}
|
||||
} catch (e) {
|
||||
// console.log("missed");
|
||||
console.log("missed");
|
||||
startContainer = false;
|
||||
}
|
||||
|
||||
|
|
@ -113,7 +112,7 @@ EPUBJS.Chapter.prototype.cfiFromRange = function(_range) {
|
|||
|
||||
// Fuzzy Match
|
||||
if(!startContainer) {
|
||||
// console.log("not found, try fuzzy match");
|
||||
console.log("not found, try fuzzy match");
|
||||
cleanStartTextContent = EPUBJS.core.cleanStringForXpath(_range.startContainer.textContent);
|
||||
startXpath = "//text()[contains(.," + cleanStartTextContent + ")]";
|
||||
|
||||
|
|
|
|||
50
src/core.js
50
src/core.js
|
|
@ -130,6 +130,7 @@ EPUBJS.core.uri = function(url){
|
|||
if(search != -1) {
|
||||
uri.search = url.slice(search + 1);
|
||||
url = url.slice(0, search);
|
||||
href = url;
|
||||
}
|
||||
|
||||
if(doubleSlash != -1) {
|
||||
|
|
@ -404,11 +405,12 @@ EPUBJS.core.queue = function(_scope){
|
|||
if(_q.length) {
|
||||
inwait = _q.shift();
|
||||
// Defer to any current tasks
|
||||
setTimeout(function(){
|
||||
scope[inwait.funcName].apply(inwait.context || scope, inwait.args);
|
||||
}, 0);
|
||||
// setTimeout(function(){
|
||||
scope[inwait.funcName].apply(inwait.context || scope, inwait.args);
|
||||
// }, 0);
|
||||
}
|
||||
};
|
||||
|
||||
// Run All
|
||||
var flush = function(){
|
||||
while(_q.length) {
|
||||
|
|
@ -419,11 +421,17 @@ EPUBJS.core.queue = function(_scope){
|
|||
var clear = function(){
|
||||
_q = [];
|
||||
};
|
||||
|
||||
var length = function(){
|
||||
return _q.length;
|
||||
};
|
||||
|
||||
return {
|
||||
"enqueue" : enqueue,
|
||||
"dequeue" : dequeue,
|
||||
"flush" : flush,
|
||||
"clear" : clear
|
||||
"clear" : clear,
|
||||
"length" : length
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -442,16 +450,20 @@ EPUBJS.core.getElementXPath = function(element) {
|
|||
EPUBJS.core.getElementTreeXPath = function(element) {
|
||||
var paths = [];
|
||||
var isXhtml = (element.ownerDocument.documentElement.getAttribute('xmlns') === "http://www.w3.org/1999/xhtml");
|
||||
var index, nodeName, tagName, pathIndex;
|
||||
|
||||
if(element.nodeType === 3){
|
||||
paths.push("text()");
|
||||
element = element.parentElement;
|
||||
if(element.nodeType === Node.TEXT_NODE){
|
||||
// index = Array.prototype.indexOf.call(element.parentNode.childNodes, element) + 1;
|
||||
index = EPUBJS.core.indexOfTextNode(element) + 1;
|
||||
|
||||
paths.push("text()["+index+"]");
|
||||
element = element.parentNode;
|
||||
}
|
||||
|
||||
// Use nodeName (instead of localName) so namespace prefix is included (if any).
|
||||
for (; element && element.nodeType == 1; element = element.parentNode)
|
||||
{
|
||||
var index = 0;
|
||||
index = 0;
|
||||
for (var sibling = element.previousSibling; sibling; sibling = sibling.previousSibling)
|
||||
{
|
||||
// Ignore document type declaration.
|
||||
|
|
@ -462,9 +474,9 @@ EPUBJS.core.getElementTreeXPath = function(element) {
|
|||
++index;
|
||||
}
|
||||
}
|
||||
var nodeName = element.nodeName.toLowerCase();
|
||||
var tagName = (isXhtml ? "xhtml:" + nodeName : nodeName);
|
||||
var pathIndex = (index ? "[" + (index+1) + "]" : "");
|
||||
nodeName = element.nodeName.toLowerCase();
|
||||
tagName = (isXhtml ? "xhtml:" + nodeName : nodeName);
|
||||
pathIndex = (index ? "[" + (index+1) + "]" : "");
|
||||
paths.splice(0, 0, tagName + pathIndex);
|
||||
}
|
||||
|
||||
|
|
@ -494,3 +506,19 @@ EPUBJS.core.cleanStringForXpath = function(str) {
|
|||
});
|
||||
return "concat(\'\'," + parts.join(",") + ")";
|
||||
};
|
||||
|
||||
EPUBJS.core.indexOfTextNode = function(textNode){
|
||||
var parent = textNode.parentElement;
|
||||
var children = parent.childNodes;
|
||||
var sib;
|
||||
var index = -1;
|
||||
for (var i = 0; i < children.length; i++) {
|
||||
sib = children[i];
|
||||
if(sib.nodeType === Node.TEXT_NODE){
|
||||
index++;
|
||||
}
|
||||
if(sib == textNode) break;
|
||||
}
|
||||
|
||||
return index;
|
||||
};
|
||||
|
|
@ -402,7 +402,8 @@ EPUBJS.EpubCFI.prototype.generateCfiFromRange = function(range, base) {
|
|||
|
||||
if(start.nodeType === 3) { // text node
|
||||
startElement = start.parentElement;
|
||||
startIndex = 1 + (2 * Array.prototype.indexOf.call(startElement.childNodes, start));
|
||||
//startIndex = 1 + (2 * Array.prototype.indexOf.call(startElement.childNodes, start));
|
||||
startIndex = 1 + (2 * EPUBJS.core.indexOfTextNode(start));
|
||||
startSteps = this.pathTo(startElement);
|
||||
} else if(range.collapsed) {
|
||||
return this.generateCfiFromElement(start, base); // single element
|
||||
|
|
@ -418,7 +419,9 @@ EPUBJS.EpubCFI.prototype.generateCfiFromRange = function(range, base) {
|
|||
|
||||
if(end.nodeType === 3) { // text node
|
||||
endElement = end.parentElement;
|
||||
endIndex = 1 + (2 * Array.prototype.indexOf.call(endElement.childNodes, end));
|
||||
// endIndex = 1 + (2 * Array.prototype.indexOf.call(endElement.childNodes, end));
|
||||
endIndex = 1 + (2 * EPUBJS.core.indexOfTextNode(end));
|
||||
|
||||
endSteps = this.pathTo(endElement);
|
||||
} else {
|
||||
endSteps = this.pathTo(end);
|
||||
|
|
@ -476,18 +479,21 @@ EPUBJS.EpubCFI.prototype.generateRangeFromCfi = function(cfi, _doc) {
|
|||
// Get the terminal step
|
||||
lastStep = cfi.steps[cfi.steps.length-1];
|
||||
startContainer = doc.evaluate(xpath, doc, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue;
|
||||
|
||||
if(!startContainer) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if(startContainer && cfi.characterOffset >= 0) {
|
||||
textLength = startContainer.length;
|
||||
|
||||
if(cfi.characterOffset < textLength) {
|
||||
range.setStart(startContainer, cfi.characterOffset);
|
||||
range.setEnd(startContainer, textLength );
|
||||
} else {
|
||||
range.setStart(startContainer, cfi.characterOffset - 1 );
|
||||
range.setEnd(startContainer, cfi.characterOffset );
|
||||
console.debug("offset greater than length:", cfi.characterOffset, textLength);
|
||||
range.setStart(startContainer, textLength - 1 );
|
||||
range.setEnd(startContainer, textLength );
|
||||
}
|
||||
} else if(startContainer) {
|
||||
range.selectNode(startContainer);
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ EPUBJS.Layout.Reflowable.prototype.format = function(documentElement, _width, _h
|
|||
var columnAxis = EPUBJS.core.prefixed('columnAxis');
|
||||
var columnGap = EPUBJS.core.prefixed('columnGap');
|
||||
var columnWidth = EPUBJS.core.prefixed('columnWidth');
|
||||
var columnFill = EPUBJS.core.prefixed('columnFill');
|
||||
|
||||
//-- Check the width and create even width columns
|
||||
var width = Math.floor(_width);
|
||||
|
|
@ -31,6 +32,7 @@ EPUBJS.Layout.Reflowable.prototype.format = function(documentElement, _width, _h
|
|||
|
||||
//-- Add columns
|
||||
documentElement.style[columnAxis] = "horizontal";
|
||||
documentElement.style[columnFill] = "auto";
|
||||
documentElement.style[columnWidth] = width+"px";
|
||||
documentElement.style[columnGap] = gap+"px";
|
||||
this.colWidth = width;
|
||||
|
|
@ -63,6 +65,7 @@ EPUBJS.Layout.ReflowableSpreads.prototype.format = function(documentElement, _wi
|
|||
var columnAxis = EPUBJS.core.prefixed('columnAxis');
|
||||
var columnGap = EPUBJS.core.prefixed('columnGap');
|
||||
var columnWidth = EPUBJS.core.prefixed('columnWidth');
|
||||
var columnFill = EPUBJS.core.prefixed('columnFill');
|
||||
|
||||
var divisor = 2,
|
||||
cutoff = 800;
|
||||
|
|
@ -91,8 +94,10 @@ EPUBJS.Layout.ReflowableSpreads.prototype.format = function(documentElement, _wi
|
|||
|
||||
//-- Add columns
|
||||
documentElement.style[columnAxis] = "horizontal";
|
||||
documentElement.style[columnFill] = "auto";
|
||||
documentElement.style[columnGap] = gap+"px";
|
||||
documentElement.style[columnWidth] = colWidth+"px";
|
||||
|
||||
this.colWidth = colWidth;
|
||||
this.gap = gap;
|
||||
return {
|
||||
|
|
|
|||
|
|
@ -69,7 +69,9 @@ EPUBJS.Render.Iframe.prototype.load = function(url){
|
|||
|
||||
EPUBJS.Render.Iframe.prototype.loaded = function(v){
|
||||
var url = this.iframe.contentWindow.location.href;
|
||||
this.trigger("render:loaded", url);
|
||||
if(url != "about:blank"){
|
||||
this.trigger("render:loaded", url);
|
||||
}
|
||||
};
|
||||
|
||||
// Resize the iframe to the given width and height
|
||||
|
|
|
|||
105
src/renderer.js
105
src/renderer.js
|
|
@ -29,7 +29,7 @@ EPUBJS.Renderer = function(renderMethod, hidden) {
|
|||
|
||||
this.spreads = true;
|
||||
this.isForcedSingle = false;
|
||||
this.resized = _.throttle(this.onResized.bind(this), 10);
|
||||
this.resized = _.debounce(this.onResized.bind(this), 100);
|
||||
|
||||
this.layoutSettings = {};
|
||||
|
||||
|
|
@ -43,6 +43,8 @@ EPUBJS.Renderer = function(renderMethod, hidden) {
|
|||
//-- Queue up page changes if page map isn't ready
|
||||
this._q = EPUBJS.core.queue(this);
|
||||
|
||||
this._moving = false;
|
||||
|
||||
};
|
||||
|
||||
//-- Renderer events for listening
|
||||
|
|
@ -95,6 +97,11 @@ EPUBJS.Renderer.prototype.initialize = function(element, width, height){
|
|||
*/
|
||||
EPUBJS.Renderer.prototype.displayChapter = function(chapter, globalLayout){
|
||||
var store = false;
|
||||
if(this._moving) {
|
||||
console.error("Rendering In Progress");
|
||||
return;
|
||||
}
|
||||
this._moving = true;
|
||||
// Get the url string from the chapter (may be from storage)
|
||||
return chapter.url().
|
||||
then(function(url) {
|
||||
|
|
@ -102,7 +109,11 @@ EPUBJS.Renderer.prototype.displayChapter = function(chapter, globalLayout){
|
|||
// Unload the previous chapter listener
|
||||
if(this.currentChapter) {
|
||||
this.currentChapter.unload(); // Remove stored blobs
|
||||
this.render.window.removeEventListener("resize", this.resized);
|
||||
|
||||
if(this.render.window){
|
||||
this.render.window.removeEventListener("resize", this.resized);
|
||||
}
|
||||
|
||||
this.removeEventListeners();
|
||||
this.removeSelectionListeners();
|
||||
this.trigger("renderer:chapterUnloaded");
|
||||
|
|
@ -113,7 +124,6 @@ EPUBJS.Renderer.prototype.displayChapter = function(chapter, globalLayout){
|
|||
|
||||
this.currentChapter = chapter;
|
||||
this.chapterPos = 1;
|
||||
this.pageMap = null;
|
||||
this.currentChapterCfiBase = chapter.cfiBase;
|
||||
|
||||
this.layoutSettings = this.reconcileLayoutSettings(globalLayout, chapter.properties);
|
||||
|
|
@ -151,11 +161,11 @@ EPUBJS.Renderer.prototype.load = function(url){
|
|||
this.formated = this.layout.format(contents, this.render.width, this.render.height, this.gap);
|
||||
this.render.setPageDimensions(this.formated.pageWidth, this.formated.pageHeight);
|
||||
|
||||
// window.addEventListener("orientationchange", this.onResized.bind(this), false);
|
||||
if(!this.initWidth && !this.initHeight){
|
||||
this.render.window.addEventListener("resize", this.resized, false);
|
||||
}
|
||||
|
||||
|
||||
this.addEventListeners();
|
||||
this.addSelectionListeners();
|
||||
|
||||
|
|
@ -163,14 +173,20 @@ EPUBJS.Renderer.prototype.load = function(url){
|
|||
this.beforeDisplay(function(){
|
||||
var pages = this.layout.calculatePages();
|
||||
var msg = this.currentChapter;
|
||||
var queued = this._q.length();
|
||||
this._moving = false;
|
||||
|
||||
this.updatePages(pages);
|
||||
|
||||
this.visibleRangeCfi = this.getVisibleRangeCfi();
|
||||
this.currentLocationCfi = this.visibleRangeCfi.start;
|
||||
this.trigger("renderer:locationChanged", this.currentLocationCfi);
|
||||
this.trigger("renderer:visibleRangeChanged", this.visibleRangeCfi);
|
||||
|
||||
msg.cfi = this.currentLocationCfi;
|
||||
if(queued === 0) {
|
||||
this.trigger("renderer:locationChanged", this.currentLocationCfi);
|
||||
this.trigger("renderer:visibleRangeChanged", this.visibleRangeCfi);
|
||||
}
|
||||
|
||||
msg.cfi = this.currentLocationCfi; //TODO: why is this cfi passed to chapterDisplayed
|
||||
this.trigger("renderer:chapterDisplayed", msg);
|
||||
|
||||
this.visible(true);
|
||||
|
|
@ -265,8 +281,16 @@ EPUBJS.Renderer.prototype.beforeDisplay = function(callback, renderer){
|
|||
// Update the renderer with the information passed by the layout
|
||||
EPUBJS.Renderer.prototype.updatePages = function(layout){
|
||||
this.pageMap = this.mapPage();
|
||||
this.displayedPages = layout.displayedPages;
|
||||
this.currentChapter.pages = layout.pageCount;
|
||||
// this.displayedPages = layout.displayedPages;
|
||||
|
||||
if (this.spreads) {
|
||||
this.displayedPages = Math.ceil(this.pageMap.length / 2);
|
||||
} else {
|
||||
this.displayedPages = this.pageMap.length;
|
||||
}
|
||||
|
||||
// this.currentChapter.pages = layout.pageCount;
|
||||
this.currentChapter.pages = this.pageMap.length;
|
||||
|
||||
this._q.flush();
|
||||
};
|
||||
|
|
@ -277,8 +301,13 @@ EPUBJS.Renderer.prototype.reformat = function(){
|
|||
var formated, pages;
|
||||
if(!this.contents) return;
|
||||
|
||||
this.layoutMethod = this.determineLayout(this.layoutSettings);
|
||||
this.layout = new EPUBJS.Layout[this.layoutMethod]();
|
||||
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]();
|
||||
}
|
||||
|
||||
this.formated = this.layout.format(this.contents, this.render.width, this.render.height, this.gap);
|
||||
this.render.setPageDimensions(this.formated.pageWidth, this.formated.pageHeight);
|
||||
|
|
@ -349,8 +378,8 @@ EPUBJS.Renderer.prototype.applyHeadTags = function(headTags) {
|
|||
//-- NAVIGATION
|
||||
|
||||
EPUBJS.Renderer.prototype.page = function(pg){
|
||||
|
||||
if(!this.pageMap) {
|
||||
console.warn("pageMap not set, queuing");
|
||||
this._q.enqueue("page", arguments);
|
||||
return true;
|
||||
}
|
||||
|
|
@ -407,6 +436,10 @@ EPUBJS.Renderer.prototype.pageByElement = function(el){
|
|||
|
||||
// Jump to the last page of the chapter
|
||||
EPUBJS.Renderer.prototype.lastPage = function(){
|
||||
if(this._moving) {
|
||||
return this._q.enqueue("lastPage", arguments);
|
||||
}
|
||||
|
||||
this.page(this.displayedPages);
|
||||
};
|
||||
|
||||
|
|
@ -521,7 +554,7 @@ EPUBJS.Renderer.prototype.textSprint = function(root, func) {
|
|||
};
|
||||
|
||||
EPUBJS.Renderer.prototype.sprint = function(root, func) {
|
||||
var treeWalker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, false, false);
|
||||
var treeWalker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, null, false);
|
||||
var node;
|
||||
while ((node = treeWalker.nextNode())) {
|
||||
func(node);
|
||||
|
|
@ -542,15 +575,30 @@ EPUBJS.Renderer.prototype.mapPage = function(){
|
|||
var cfi;
|
||||
var check = function(node) {
|
||||
var elPos;
|
||||
var elRange;
|
||||
var children = Array.prototype.slice.call(node.childNodes);
|
||||
if (node.nodeType == Node.ELEMENT_NODE) {
|
||||
elPos = node.getBoundingClientRect();
|
||||
// elPos = node.getBoundingClientRect();
|
||||
elRange = document.createRange();
|
||||
elRange.selectNodeContents(node);
|
||||
elPos = elRange.getBoundingClientRect();
|
||||
|
||||
if(!elPos || (elPos.width === 0 && elPos.height === 0)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(elPos.left + elPos.width > elLimit) {
|
||||
//-- Element starts new Col
|
||||
if(elPos.left > elLimit) {
|
||||
children.forEach(function(node){
|
||||
if(node.nodeType == Node.TEXT_NODE &&
|
||||
node.textContent.trim().length) {
|
||||
checkText(node);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//-- Element Spans new Col
|
||||
if(elPos.right > elLimit) {
|
||||
children.forEach(function(node){
|
||||
if(node.nodeType == Node.TEXT_NODE &&
|
||||
node.textContent.trim().length) {
|
||||
|
|
@ -589,6 +637,7 @@ EPUBJS.Renderer.prototype.mapPage = function(){
|
|||
start: cfi,
|
||||
end: null
|
||||
});
|
||||
|
||||
page += 1;
|
||||
limit = (width * page) - offset;
|
||||
elLimit = limit;
|
||||
|
|
@ -626,6 +675,7 @@ EPUBJS.Renderer.prototype.mapPage = function(){
|
|||
ranges = null;
|
||||
range = null;
|
||||
root = null;
|
||||
|
||||
return map;
|
||||
};
|
||||
|
||||
|
|
@ -850,7 +900,7 @@ EPUBJS.Renderer.prototype.getVisibleRangeCfi = function(){
|
|||
}
|
||||
|
||||
if(!startRange) {
|
||||
console.warn("page range miss:", pg);
|
||||
console.warn("page range miss:", pg, this.pageMap);
|
||||
startRange = this.pageMap[this.pageMap.length-1];
|
||||
endRange = startRange;
|
||||
}
|
||||
|
|
@ -867,6 +917,10 @@ EPUBJS.Renderer.prototype.gotoCfi = function(cfi){
|
|||
var marker;
|
||||
var range;
|
||||
|
||||
if(this._moving){
|
||||
return this._q.enqueue("gotoCfi", arguments);
|
||||
}
|
||||
|
||||
if(_.isString(cfi)){
|
||||
cfi = this.epubcfi.parse(cfi);
|
||||
}
|
||||
|
|
@ -941,13 +995,7 @@ EPUBJS.Renderer.prototype.resize = function(width, height, setSize){
|
|||
this.render.resize(this.width, this.height);
|
||||
}
|
||||
|
||||
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]();
|
||||
}
|
||||
|
||||
|
||||
if(this.contents){
|
||||
this.reformat();
|
||||
|
|
@ -969,7 +1017,9 @@ EPUBJS.Renderer.prototype.onResized = function(e) {
|
|||
};
|
||||
|
||||
EPUBJS.Renderer.prototype.addEventListeners = function(){
|
||||
|
||||
if(!this.render.document) {
|
||||
return;
|
||||
}
|
||||
this.listenedEvents.forEach(function(eventName){
|
||||
this.render.document.addEventListener(eventName, this.triggerEvent.bind(this), false);
|
||||
}, this);
|
||||
|
|
@ -977,7 +1027,9 @@ EPUBJS.Renderer.prototype.addEventListeners = function(){
|
|||
};
|
||||
|
||||
EPUBJS.Renderer.prototype.removeEventListeners = function(){
|
||||
|
||||
if(!this.render.document) {
|
||||
return;
|
||||
}
|
||||
this.listenedEvents.forEach(function(eventName){
|
||||
this.render.document.removeEventListener(eventName, this.triggerEvent, false);
|
||||
}, this);
|
||||
|
|
@ -994,6 +1046,9 @@ EPUBJS.Renderer.prototype.addSelectionListeners = function(){
|
|||
};
|
||||
|
||||
EPUBJS.Renderer.prototype.removeSelectionListeners = function(){
|
||||
if(!this.render.document) {
|
||||
return;
|
||||
}
|
||||
this.doc.removeEventListener("selectionchange", this.onSelectionChange, false);
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue