1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-15 23:15:48 +01:00

Merge some recent fixes into 1.0b5 branch.

This commit is contained in:
Kris Maglione
2011-01-17 13:28:14 -05:00
parent b52e78b92e
commit 2c74786f1c
13 changed files with 212 additions and 138 deletions

View File

@@ -262,12 +262,13 @@ var Template = Module("Template", {
sourceLink: function (frame) {
let url = (frame.filename || "unknown").replace(/.* -> /, "");
let path = util.urlPath(url);
XML.ignoreWhitespace = false; XML.prettyPrinting = false;
return <a xmlns:dactyl={NS} dactyl:command="buffer.viewSource"
href={url} line={frame.lineNumber}
href={url} path={path} line={frame.lineNumber}
highlight="URL">{
util.urlPath(url) + ":" + frame.lineNumber
path + ":" + frame.lineNumber
}</a>
},
@@ -331,11 +332,11 @@ var Template = Module("Template", {
this.map(iter, function (item)
<tr>
<td style="padding-right: 2em;">
<span highlight="Usage">{
<span highlight="Usage Link">{
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 highlight="LinkInfo" xmlns:dactyl={NS}>Defined at {sourceLink(frame)}</span>
}</span>
</td>
<td>{desc(item)}</td>