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

Switched from URIjs to URL and Node Path

Browse source
This commit is contained in:
Fred Chasen 2016-10-30 22:14:01 +01:00
parent 869a170564
commit 315650006e
22 changed files with 1060 additions and 3614 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/navigation.js
View file

@ -1,6 +1,6 @@
var core = require('./core');
var Parser = require('./parser');
var URI = require('urijs');
var path = require('path');
function Navigation(_package, _request){
var navigation = this;
@ -13,7 +13,11 @@ function Navigation(_package, _request){
this.tocById = {};
if(_package.navPath) {
this.navUrl = URI(_package.navPath).absoluteTo(_package.baseUrl).toString();
if (_package.baseUrl) {
this.navUrl = new URL(_package.navPath, _package.baseUrl).toString();
} else {
this.navUrl = path.resolve(_package.basePath, _package.navPath);
}
this.nav = {};
this.nav.load = function(_request){
@ -32,7 +36,12 @@ function Navigation(_package, _request){
}
if(_package.ncxPath) {
this.ncxUrl = URI(_package.ncxPath).absoluteTo(_package.baseUrl).toString();
if (_package.baseUrl) {
this.ncxUrl = new URL(_package.ncxPath, _package.baseUrl).toString();
} else {
this.ncxUrl = path.resolve(_package.basePath, _package.ncxPath);
}
this.ncx = {};
this.ncx.load = function(_request){