mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-22 16:18:08 +02:00
Code Activity

Fix the combineUrl function

Browse source 
* Allow a url to omit the protocol and use the same protocol as the
* current page
This commit is contained in:
Luís Nabais 2014-02-28 12:39:27 +00:00
parent cab5d7b96f
commit 220a8e4f0e
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/shared/util.js
View file

@ -228,7 +228,11 @@ function combineUrl(baseUrl, url) {
if (url.charAt(0) == '/') {
// absolute path
var i = baseUrl.indexOf('://');
i = baseUrl.indexOf('/', i + 3);
if (url.charAt(1) === '/') {
++i;
} else {
i = baseUrl.indexOf('/', i + 3);
}
return baseUrl.substring(0, i) + url;
} else {
// relative path