1
0
Fork 0
mirror of https://github.com/futurepress/epub.js.git synced 2025-10-03 14:59:18 +02:00

small fixes

This commit is contained in:
Fred Chasen 2014-10-06 17:44:04 -04:00
parent cf603fcca8
commit 105a3a36d6
7 changed files with 150 additions and 64 deletions

View file

@ -248,6 +248,7 @@ EPUBJS.core.resolveUrl = function(base, path) {
pathUri = EPUBJS.core.uri(path),
baseDirectory = baseUri.directory,
pathDirectory = pathUri.directory,
directories = [],
// folders = base.split("/"),
paths;
@ -271,8 +272,9 @@ EPUBJS.core.resolveUrl = function(base, path) {
pathDirectory = pathDirectory.substring(0, pathDirectory.length-1);
}
directories = baseDirectory.split("/");
if(baseDirectory) {
directories = baseDirectory.split("/");
}
paths = pathDirectory.split("/");
@ -287,7 +289,17 @@ EPUBJS.core.resolveUrl = function(base, path) {
}
});
url = url.concat(baseUri.origin, directories, segments, pathUri.filename);
url = [baseUri.origin];
if(directories.length) {
url = url.concat(directories);
}
if(segments) {
url = url.concat(segments);
}
url = url.concat(pathUri.filename);
return url.join("/");
};