gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 20:32:25 +01:00
Code Issues Projects Releases Wiki Activity

Fix plugin loading

Browse Source
This commit is contained in:
Kris Maglione
2008-10-16 00:19:03 +00:00
parent 00039bf6c5
commit bb32ae917c
1 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
content/liberator.js
View File

@@ -908,33 +908,31 @@ const liberator = (function () //{{{
{ {
let dirs = io.getRuntimeDirectories("plugin"); let dirs = io.getRuntimeDirectories("plugin");
if (dirs.length > 0) if (dirs.length == 0)
{
for (let [,dir] in Iterator(dirs))
{
// TODO: search plugins/**/* for plugins
liberator.echomsg("Searching for \"plugin/*.{js,vimp}\" in \"" + dir.path + "\"", 2);
liberator.log("Sourcing plugin directory: " + dir.path + "...", 3);
let files = io.readDirectory(dir.path, true);
files.forEach(function (file) {
if (!file.isDirectory() && /\.(js|vimp)$/i.test(file.path) && !(file.path in pluginFiles))
{
try
{
io.source(file.path, false);
pluginFiles[file.path] = true;
}
catch (e) {};
}
});
}
}
else
{ {
liberator.log("No user plugin directory found", 3); liberator.log("No user plugin directory found", 3);
return;
}
for (let [,dir] in Iterator(dirs))
{
// TODO: search plugins/**/* for plugins
liberator.echomsg("Searching for \"plugin/*.{js,vimp}\" in \"" + dir.path + "\"", 2);
liberator.log("Sourcing plugin directory: " + dir.path + "...", 3);
let files = io.readDirectory(dir.path, true);
files.forEach(function (file) {
if (!file.isDirectory() && /\.(js|vimp)$/i.test(file.path) && !(file.path in liberator.pluginFiles))
{
try
{
io.source(file.path, false);
liberator.pluginFiles[file.path] = true;
}
catch (e) {};
}
});
} }
} }
catch (e) catch (e)