gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-24 02:22:26 +01:00
Code Issues Projects Releases Wiki Activity

remove io.pathExists()

Browse Source
This commit is contained in:
Doug Kearns
2007-10-20 02:53:46 +00:00
parent 0c505415a0
commit 9873fed42c
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
content/io.js
View File

@@ -86,16 +86,6 @@ vimperator.io = (function()
return path;
},
// path can also be a filename, not limited to directories
pathExists: function(path)
{
var p = Components.classes["@mozilla.org/file/local;1"]
.createInstance(Components.interfaces.nsILocalFile);
p.initWithPath(this.expandPath(path));
return p.exists();
},
getPluginDir: function()
{
var plugin_dir;
@@ -105,22 +95,22 @@ vimperator.io = (function()
else
plugin_dir = "~/.vimperator/plugin";
plugin_dir = this.expandPath(plugin_dir);
plugin_dir = this.getFile(this.expandPath(plugin_dir));
return this.pathExists(plugin_dir) ? plugin_dir : null;
return plugin_dir.exists() && plugin_dir.isDirectory() ? plugin_dir : null;
},
getRCFile: function()
{
var rc_file1 = this.expandPath("~/.vimperatorrc");
var rc_file2 = this.expandPath("~/_vimperatorrc");
var rc_file1 = this.getFile(this.expandPath("~/.vimperatorrc"));
var rc_file2 = this.getFile(this.expandPath("~/_vimperatorrc"));
if (navigator.platform == "Win32")
[rc_file1, rc_file2] = [rc_file2, rc_file1]
if (this.pathExists(rc_file1))
if (rc_file1.exists() && rc_file1.isFile())
return rc_file1;
else if (this.pathExists(rc_file2))
else if (rc_file2.exists() && rc_file2.isFile())
return rc_file2;
else
return null;