Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2400 from khodzha/2279_issue

Browse Source 
combineUrl fix
This commit is contained in:
Yury Delendik 2012-11-24 12:00:13 -08:00
commit 80f8f51b8d
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/util.js
View File

@ -85,6 +85,8 @@ function assert(cond, msg) {
// Combines two URLs. The baseUrl shall be absolute URL. If the url is an // Combines two URLs. The baseUrl shall be absolute URL. If the url is an
// absolute URL, it will be returned as is. // absolute URL, it will be returned as is.
function combineUrl(baseUrl, url) { function combineUrl(baseUrl, url) {
if (!url)
return baseUrl;
if (url.indexOf(':') >= 0) if (url.indexOf(':') >= 0)
return url; return url;
if (url.charAt(0) == '/') { if (url.charAt(0) == '/') {

16
test/unit/util_spec.js
View File

@ -45,6 +45,22 @@ describe('util', function() {
var expected = 'http://server/test2.html'; var expected = 'http://server/test2.html';
expect(result).toEqual(expected); expect(result).toEqual(expected);
}); });
it('returns base url when url is empty', function() {
var baseUrl = 'http://server/index.html';
var url = '';
var result = combineUrl(baseUrl, url);
var expected = 'http://server/index.html';
expect(result).toEqual(expected);
});
it('returns base url when url is undefined', function() {
var baseUrl = 'http://server/index.html';
var url;
var result = combineUrl(baseUrl, url);
var expected = 'http://server/index.html';
expect(result).toEqual(expected);
});
}); });
}); });