gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-05 13:15:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix joinPaths when stuff dun't exist

Browse Source
This commit is contained in:
Kris Maglione
2008-12-16 17:24:18 -05:00
parent 83b30172f8
commit 672e109c67
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/content/io.js
View File

@@ -118,9 +118,16 @@ function IO() //{{{
function joinPaths(head, tail)
{
let path = ioManager.getFile(head);
path.appendRelativePath(ioManager.expandPath(tail)); // FIXME: should only expand env vars and normalise path separators
if (path.exists())
path.normalize();
try
{
path.appendRelativePath(ioManager.expandPath(tail)); // FIXME: should only expand env vars and normalise path separators
if (path.exists())
path.normalize();
}
catch(e)
{
return { exists: function () false };
}
return path;
}
@@ -943,7 +950,7 @@ lookup:
liberator.echomsg("finished sourcing " + filename.quote(), 2);
liberator.log("Sourced: " + file.path, 3);
liberator.log("Sourced: " + filename, 3);
}
catch (e)
{

2
common/content/options.js
View File

@@ -683,7 +683,7 @@ function Options() //{{{
context.completions = [
[loadPreference(filter, null, false), "Current Value"],
[loadPreference(filter, null, true), "Default Value"]
];
].filter(function ([k]) k != null);
return;
}