wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1207506 - Replace all uses of Services.io in path.js with URL;r=janx

Browse Source
This commit is contained in:
Eddy Bruel 2016-03-04 13:06:48 +01:00
parent 6613c02e64
commit 1bbc0e2817
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devtools/shared/path.js
View File

@ -4,14 +4,13 @@
"use strict";
const Services = require("Services");
const URL = require("URL");
/*
* Returns the directory name of the path
*/
exports.dirname = path => {
return Services.io.newURI(
".", null, Services.io.newURI(path, null, null)).spec;
return new URL(".", new URL(path)).href;
}
/*
@ -19,10 +18,10 @@ exports.dirname = path => {
* The initial path must be an full URI with a protocol (i.e. http://).
*/
exports.joinURI = (initialPath, ...paths) => {
let uri;
let url;
try {
uri = Services.io.newURI(initialPath, null, null);
url = new URL(initialPath);
}
catch(e) {
return;
@ -30,9 +29,9 @@ exports.joinURI = (initialPath, ...paths) => {
for(let path of paths) {
if (path) {
uri = Services.io.newURI(path, null, uri);
url = new URL(path, url);
}
}
return uri.spec;
return url.href;
}