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

Get rid of silly config.helpFiles.

Browse Source 
--HG--
branch : xslt
rename : common/components/chrome-data.js => common/components/protocols.js
This commit is contained in:
Kris Maglione
2009-10-25 20:06:50 -04:00
parent 10091e0fd1
commit 486ac5954a
7 changed files with 119 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/content/liberator.js
View File

@@ -215,7 +215,7 @@ const liberator = (function () //{{{
options.add(["helpfile", "hf"],
"Name of the main help file",
"string", "intro.html");
"string", "intro");
options.add(["loadplugins", "lpl"],
"Load plugin scripts when starting up",
@@ -1356,6 +1356,8 @@ const liberator = (function () //{{{
*/
findHelp: function (topic, unchunked)
{
if (topic in services.get("liberator:").FILE_MAP)
return topic;
unchunked = !!unchunked;
let items = completion._runCompleter("help", topic, null, unchunked).items;
let partialMatch = null;
@@ -1388,8 +1390,8 @@ const liberator = (function () //{{{
if (!topic && !unchunked)
{
let helpFile = options["helpfile"];
if (config.helpFiles.indexOf(helpFile) != -1)
liberator.open("liberator://help/" + helpFile.replace(/\.html$/, ""), { from: "help" });
if (helpFile in services.get("liberator:").FILE_MAP)
liberator.open("liberator://help/" + helpFile, { from: "help" });
else
liberator.echomsg("Sorry, help file " + helpFile.quote() + " not found");
return;
@@ -1725,7 +1727,6 @@ const liberator = (function () //{{{
liberator.log("Initializing liberator object...", 0);
services.get("liberator:").helpNamespaces = [config.name.toLowerCase(), "liberator"];
services.get("liberator:").helpFiles = config.helpFiles.map(function (f) f.replace(/\..*/, ""));
config.features.push(getPlatformFeature());