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

Make source linkfication in :list* less annoying. Add help linkification to the entries. Make source links hintable.

Browse Source 
--HG--
extra : rebase_source : 793a9d6a6d84dc3c2f8dc2dd5d0ad468e565b1c4
This commit is contained in:
Kris Maglione
2010-12-18 13:47:56 -05:00
parent 3414138989
commit 2a27292e8b
8 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
common/modules/template.jsm
View File

@@ -79,14 +79,14 @@ const Template = Module("Template", {
// </e4x>
},
helpLink: function (topic, type) {
helpLink: function (topic, text, type) {
if (services["dactyl:"].initialized && !set.has(services["dactyl:"].HELP_TAGS, topic))
return <>{topic}</>;
return <span highlight={type || ""}>{text || topic}</span>;
XML.ignoreWhitespace = false; XML.prettyPrinting = false;
type = type || /^'.*'$/.test(topic) ? "HelpOpt" :
/^:\w/.test(topic) ? "HelpEx" : "HelpKey";
return <a highlight={type} href={"dactyl://help-tag/" + topic} dactyl:command="dactyl.help" xmlns:dactyl={NS}>{topic}</a>
type = type || (/^'.*'$/.test(topic) ? "HelpOpt" :
/^:\w/.test(topic) ? "HelpEx" : "HelpKey");
return <a highlight={type} tag={topic} href={"dactyl://help-tag/" + topic} dactyl:command="dactyl.help" xmlns:dactyl={NS}>{text || topic}</a>
},
// if "processStrings" is true, any passed strings will be surrounded by " and
@@ -314,17 +314,25 @@ const Template = Module("Template", {
usage: function usage(iter, format) {
XML.ignoreWhitespace = false; XML.prettyPrinting = false;
let desc = format && format.description || function (item) template.linkifyHelp(item.description);
let help = format && format.help || function (item) item.name;
function sourceLink(frame) {
let source = template.sourceLink(frame);
source.@NS::hint = source.text();
return source;
}
// <e4x>
return <table>
{
this.map(iter, function (item)
<tr>
<td style="padding-right: 20px" highlight="Usage">{
let (name = item.name || item.names[0], frame = item.definedAt)
!frame ? name :
<span highlight="Title">{name}</span> + <> </> +
<span highlight="LineInfo">Defined at {template.sourceLink(frame)}</span>
}</td>
<td style="padding-right: 3em;">
<span highlight="Usage">{
let (name = item.name || item.names[0], frame = item.definedAt)
!frame ? name :
template.helpLink(help(item), name, "Title") +
<span highlight="LineInfo" xmlns:dactyl={NS}>Defined at {sourceLink(frame)}</span>
}</span>
</td>
<td>{desc(item)}</td>
</tr>)
}