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

Add tests for dead help links. Fix some minor bugs. Show error when trying to modify a builtin group rather than failing silently.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-21 16:22:30 -05:00
parent d62c93aef0
commit 234f50bce8
18 changed files with 92 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/content/help.js
View File

@@ -6,14 +6,18 @@
function checkFragment() {
document.title = document.getElementsByTagNameNS("http://www.w3.org/1999/xhtml", "title")[0].textContent;
var frag = document.location.hash.substr(1);
var elem = document.getElementById(frag);
function action() {
content.scrollTo(0, content.scrollY + elem.getBoundingClientRect().top - 10); // 10px context
}
if (elem) {
action();
setTimeout(action, 10);
var frag = document.location.hash.substr(1);
if (frag) {
var elem = document.getElementById(frag);
if (elem) {
action();
setTimeout(action, 10);
}
}
}

15
common/content/help.xsl
View File

@@ -295,7 +295,10 @@
<xsl:template name="linkify-tag">
<xsl:param name="contents" select="text()"/>
<xsl:variable name="tag" select="$contents"/>
<a href="dactyl://help-tag/{$tag}" style="color: inherit;">
<a style="color: inherit;">
<xsl:if test="@link != 'false'">
<xsl:attribute name="href">dactyl://help-tag/<xsl:value-of select="$tag"/></xsl:attribute>
</xsl:if>
<xsl:if test="contains(ancestor::*/@document-tags, concat(' ', $tag, ' '))">
<xsl:attribute name="href">#<xsl:value-of select="$tag"/></xsl:attribute>
</xsl:if>
@@ -370,6 +373,7 @@
<xsl:template match="dactyl:link" mode="help-2">
<a>
<xsl:choose>
<xsl:when test="not(@topic)"/>
<xsl:when test="regexp:match(@topic, '^([a-zA-Z]*:|[^/]*#|/)', '')">
<xsl:attribute name="href"><xsl:value-of select="@topic"/></xsl:attribute>
</xsl:when>
@@ -468,7 +472,12 @@
<html:span style="display: inline-block;">
<ex>:set</ex>
<xsl:text> </xsl:text>
<link topic="'{@opt}'"><hl key="HelpOpt"><xsl:value-of select="@opt"/></hl></link>
<link>
<xsl:if test="@link != 'false'">
<xsl:attribute name="topic">'<xsl:value-of select="@opt"/>'</xsl:attribute>
</xsl:if>
<hl key="HelpOpt"><xsl:value-of select="@opt"/></hl>
</link>
<xsl:choose>
<xsl:when test="@op and @op != ''"><xsl:value-of select="@op"/></xsl:when>
<xsl:otherwise>=</xsl:otherwise>
@@ -482,7 +491,7 @@
<xsl:template match="dactyl:set" mode="help-2">
<xsl:variable name="nodes">
<code xmlns="&xmlns.dactyl;">
<se opt="{@opt}" op="{@op}">
<se opt="{@opt}" op="{@op}" link="{@link}">
<xsl:copy-of select="@*|node()"/>
</se>
</code>