mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-20 23:28:06 +02:00
Code Activity

Fixes unit tests and adds few for util.js

Browse source
This commit is contained in:
Yury Delendik 2012-06-23 15:35:59 -05:00
parent 00f1d6dbf1
commit 0dd445bf18
4 changed files with 62 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/util.js
View file

@ -57,6 +57,8 @@ function assert(cond, msg) {
error(msg);
}
// Combines two URLs. The baseUrl shall be absolute URL. If the url is an
// absolute URL, it will be returned as is.
function combineUrl(baseUrl, url) {
if (url.indexOf(':') >= 0)
return url;
@ -67,10 +69,13 @@ function combineUrl(baseUrl, url) {
return baseUrl.substring(0, i) + url;
} else {
// relative path
var i = baseUrl.lastIndexOf('#');
i = baseUrl.lastIndexOf('?', i < 0 ? baseUrl.length : i);
i = baseUrl.lastIndexOf('/', i < 0 ? baseUrl.length : i);
return baseUrl.substring(0, i + 1) + url;
var pathLength = baseUrl.length, i;
i = baseUrl.lastIndexOf('#');
pathLength = i >= 0 ? i : pathLength;
i = baseUrl.lastIndexOf('?', pathLength);
pathLength = i >= 0 ? i : pathLength;
var prefixLength = baseUrl.lastIndexOf('/', pathLength);
return baseUrl.substring(0, prefixLength + 1) + url;
}
}
PDFJS.combineUrl = combineUrl;