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

Merge pull request #618 from futurepress/cfi_fixes

Browse source 
Bring in spinePos fixes from v0.3 EpubCFI
This commit is contained in:
Fred Chasen 2017-05-16 11:08:06 -04:00 • committed by GitHub
commit 53a53d8eed
9 changed files with 80 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

45
build/epub.js
View file

@ -2546,7 +2546,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
'use strict';
var EPUBJS = EPUBJS || {};
EPUBJS.VERSION = "0.2.17";
EPUBJS.VERSION = "0.2.18";
EPUBJS.plugins = EPUBJS.plugins || {};
@ -4434,6 +4434,11 @@ EPUBJS.Chapter.prototype.replaceWithStored = function(query, attr, func, callbac
var EPUBJS = EPUBJS || {};
EPUBJS.core = {};
var ELEMENT_NODE = 1;
var TEXT_NODE = 3;
var COMMENT_NODE = 8;
var DOCUMENT_NODE = 9;
//-- Get a element for an id
EPUBJS.core.getEl = function(elem) {
return document.getElementById(elem);
@ -5058,13 +5063,37 @@ EPUBJS.core.values = function(object) {
return result;
};
EPUBJS.core.indexOfNode = function(node, typeId) {
var parent = node.parentNode;
var children = parent.childNodes;
var sib;
var index = -1;
for (var i = 0; i < children.length; i++) {
sib = children[i];
if (sib.nodeType === typeId) {
index++;
}
if (sib == node) break;
}
return index;
}
EPUBJS.core.indexOfTextNode = function(textNode) {
return EPUBJS.core.indexOfNode(textNode, TEXT_NODE);
}
EPUBJS.core.indexOfElementNode = function(elementNode) {
return EPUBJS.core.indexOfNode(elementNode, ELEMENT_NODE);
}
EPUBJS.EpubCFI = function(cfiStr){
if(cfiStr) return this.parse(cfiStr);
};
EPUBJS.EpubCFI.prototype.generateChapterComponent = function(_spineNodeIndex, _pos, id) {
var pos = parseInt(_pos),
spineNodeIndex = _spineNodeIndex + 1,
spineNodeIndex = (_spineNodeIndex + 1) * 2
cfi = '/'+spineNodeIndex+'/';
cfi += (pos + 1) * 2;
@ -5090,7 +5119,7 @@ EPUBJS.EpubCFI.prototype.generateCfiFromElement = function(element, chapter) {
return "epubcfi(" + chapter + "!/4/)";
} else {
// First Text Node
return "epubcfi(" + chapter + "!" + path + "/1:0)";
return "epubcfi(" + chapter + "!/" + path + "/1:0)";
}
};
@ -5435,7 +5464,7 @@ EPUBJS.EpubCFI.prototype.generateCfiFromTextNode = function(anchor, offset, base
var steps = this.pathTo(parent);
var path = this.generatePathComponent(steps);
var index = 1 + (2 * Array.prototype.indexOf.call(parent.childNodes, anchor));
return "epubcfi(" + base + "!" + path + "/"+index+":"+(offset || 0)+")";
return "epubcfi(" + base + "!/" + path + "/"+index+":"+(offset || 0)+")";
};
EPUBJS.EpubCFI.prototype.generateCfiFromRangeAnchor = function(range, base) {
@ -5487,10 +5516,10 @@ EPUBJS.EpubCFI.prototype.generateCfiFromRange = function(range, base) {
endPath = endPath + "/";
}
return "epubcfi(" + base + "!" + startPath + "/" + startIndex + ":" + startOffset + "," + endPath + endIndex + ":" + endOffset + ")";
return "epubcfi(" + base + "!/" + startPath + "/" + startIndex + ":" + startOffset + "," + endPath + endIndex + ":" + endOffset + ")";
} else {
return "epubcfi(" + base + "!" + startPath + "/"+ startIndex +":"+ startOffset +")";
return "epubcfi(" + base + "!/" + startPath + "/"+ startIndex +":"+ startOffset +")";
}
};
@ -5594,6 +5623,7 @@ EPUBJS.EpubCFI.prototype.generateRangeFromCfi = function(cfi, _doc) {
EPUBJS.EpubCFI.prototype.isCfiString = function(target) {
return typeof target === 'string' && target.indexOf('epubcfi(') === 0;
};
EPUBJS.Events = function(obj, el){
this.events = {};
@ -6545,7 +6575,8 @@ EPUBJS.Parser.prototype.spine = function(spineXml, manifest){
var selected = spineXml.getElementsByTagName("itemref"),
items = Array.prototype.slice.call(selected);
var spineNodeIndex = Array.prototype.indexOf.call(spineXml.parentNode.childNodes, spineXml);
// var spineNodeIndex = Array.prototype.indexOf.call(spineXml.parentNode.childNodes, spineXml);
var spineNodeIndex = EPUBJS.core.indexOfElementNode(spineXml);
var epubcfi = new EPUBJS.EpubCFI();

2
build/epub.js.map
View file

File diff suppressed because one or more lines are too long

2
build/epub.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "epubjs",
"version": "0.2.17",
"version": "0.2.18",
"repository": "https://github.com/futurepress/epub.js",
"description": "Render ePub documents in the browser, across many devices",
"main": "server.js",

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

File diff suppressed because one or more lines are too long

2
src/base.js
View file

@ -1,7 +1,7 @@
'use strict';
var EPUBJS = EPUBJS || {};
EPUBJS.VERSION = "0.2.17";
EPUBJS.VERSION = "0.2.18";
EPUBJS.plugins = EPUBJS.plugins || {};

29
src/core.js
View file

@ -1,6 +1,11 @@
var EPUBJS = EPUBJS || {};
EPUBJS.core = {};
var ELEMENT_NODE = 1;
var TEXT_NODE = 3;
var COMMENT_NODE = 8;
var DOCUMENT_NODE = 9;
//-- Get a element for an id
EPUBJS.core.getEl = function(elem) {
return document.getElementById(elem);
@ -624,3 +629,27 @@ EPUBJS.core.values = function(object) {
}
return result;
};
EPUBJS.core.indexOfNode = function(node, typeId) {
var parent = node.parentNode;
var children = parent.childNodes;
var sib;
var index = -1;
for (var i = 0; i < children.length; i++) {
sib = children[i];
if (sib.nodeType === typeId) {
index++;
}
if (sib == node) break;
}
return index;
}
EPUBJS.core.indexOfTextNode = function(textNode) {
return EPUBJS.core.indexOfNode(textNode, TEXT_NODE);
}
EPUBJS.core.indexOfElementNode = function(elementNode) {
return EPUBJS.core.indexOfNode(elementNode, ELEMENT_NODE);
}

12
src/epubcfi.js
View file

@ -4,7 +4,7 @@ EPUBJS.EpubCFI = function(cfiStr){
EPUBJS.EpubCFI.prototype.generateChapterComponent = function(_spineNodeIndex, _pos, id) {
var pos = parseInt(_pos),
spineNodeIndex = _spineNodeIndex + 1,
spineNodeIndex = (_spineNodeIndex + 1) * 2
cfi = '/'+spineNodeIndex+'/';
cfi += (pos + 1) * 2;
@ -30,7 +30,7 @@ EPUBJS.EpubCFI.prototype.generateCfiFromElement = function(element, chapter) {
return "epubcfi(" + chapter + "!/4/)";
} else {
// First Text Node
return "epubcfi(" + chapter + "!" + path + "/1:0)";
return "epubcfi(" + chapter + "!/" + path + "/1:0)";
}
};
@ -375,7 +375,7 @@ EPUBJS.EpubCFI.prototype.generateCfiFromTextNode = function(anchor, offset, base
var steps = this.pathTo(parent);
var path = this.generatePathComponent(steps);
var index = 1 + (2 * Array.prototype.indexOf.call(parent.childNodes, anchor));
return "epubcfi(" + base + "!" + path + "/"+index+":"+(offset || 0)+")";
return "epubcfi(" + base + "!/" + path + "/"+index+":"+(offset || 0)+")";
};
EPUBJS.EpubCFI.prototype.generateCfiFromRangeAnchor = function(range, base) {
@ -427,10 +427,10 @@ EPUBJS.EpubCFI.prototype.generateCfiFromRange = function(range, base) {
endPath = endPath + "/";
}
return "epubcfi(" + base + "!" + startPath + "/" + startIndex + ":" + startOffset + "," + endPath + endIndex + ":" + endOffset + ")";
return "epubcfi(" + base + "!/" + startPath + "/" + startIndex + ":" + startOffset + "," + endPath + endIndex + ":" + endOffset + ")";
} else {
return "epubcfi(" + base + "!" + startPath + "/"+ startIndex +":"+ startOffset +")";
return "epubcfi(" + base + "!/" + startPath + "/"+ startIndex +":"+ startOffset +")";
}
};
@ -533,4 +533,4 @@ EPUBJS.EpubCFI.prototype.generateRangeFromCfi = function(cfi, _doc) {
EPUBJS.EpubCFI.prototype.isCfiString = function(target) {
return typeof target === 'string' && target.indexOf('epubcfi(') === 0;
};
};

3
src/parser.js
View file

@ -243,7 +243,8 @@ EPUBJS.Parser.prototype.spine = function(spineXml, manifest){
var selected = spineXml.getElementsByTagName("itemref"),
items = Array.prototype.slice.call(selected);
var spineNodeIndex = Array.prototype.indexOf.call(spineXml.parentNode.childNodes, spineXml);
// var spineNodeIndex = Array.prototype.indexOf.call(spineXml.parentNode.childNodes, spineXml);
var spineNodeIndex = EPUBJS.core.indexOfElementNode(spineXml);
var epubcfi = new EPUBJS.EpubCFI();