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

Fix dactyl:link topic attribute URI scheme matching conflicting with :excmds.

Browse Source
This commit is contained in:
Štěpán Němec
2011-03-13 09:04:25 +01:00
parent 3d09a0e843
commit 308f1b86dc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/content/help.xsl
View File

@@ -378,14 +378,14 @@
<a> <a>
<xsl:choose> <xsl:choose>
<xsl:when test="not(@topic)"/> <xsl:when test="not(@topic)"/>
<xsl:when test="regexp:match(@topic, '^([a-zA-Z]*:|[^/]*#|/)', '')"> <xsl:when test="regexp:match(@topic, '^([a-zA-Z]+:|[^/]*#|/)', '')">
<xsl:attribute name="href"><xsl:value-of select="@topic"/></xsl:attribute> <xsl:attribute name="href"><xsl:value-of select="@topic"/></xsl:attribute>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:attribute name="href"><xsl:value-of select="concat('dactyl://help-tag/', @topic)"/></xsl:attribute> <xsl:attribute name="href"><xsl:value-of select="concat('dactyl://help-tag/', @topic)"/></xsl:attribute>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
<xsl:if test="regexp:match(@topic, '^[a-zA-Z]*:', '') <xsl:if test="regexp:match(@topic, '^[a-zA-Z]+:', '')
and not(starts-with(@topic, 'mailto:') or and not(starts-with(@topic, 'mailto:') or
starts-with(@topic, 'chrome:') or starts-with(@topic, 'chrome:') or
starts-with(@topic, 'resource:') or starts-with(@topic, 'resource:') or

2
pentadactyl/locale/en-US/intro.xml
View File

@@ -134,7 +134,7 @@
<li>Quick and powerful <link topic="hints">keyboard navigation</link> for links, input fields, etc.</li> <li>Quick and powerful <link topic="hints">keyboard navigation</link> for links, input fields, etc.</li>
<li>Vim-like <link topic="status-line">status line</link></li> <li>Vim-like <link topic="status-line">status line</link></li>
<li>Keyboard <t>macros</t>, along with custom key mappings and commands</li> <li>Keyboard <t>macros</t>, along with custom key mappings and commands</li>
<li>Minimal GUI, along with commands to <link href=":toolbarhide">hide</link> and <link href=":toolbartoggle">toggle</link> toolbars and menus</li> <li>Minimal GUI, along with commands to <link topic=":toolbarhide">hide</link> and <link topic=":toolbartoggle">toggle</link> toolbars and menus</li>
<li>Ability to <ex>:source</ex> JavaScript, CSS, and &dactyl.appName; command files</li> <li>Ability to <ex>:source</ex> JavaScript, CSS, and &dactyl.appName; command files</li>
<li>Ability to <link topic="marks">mark</link> the current page position and return to it</li> <li>Ability to <link topic="marks">mark</link> the current page position and return to it</li>
<li>Count support for many commands (<tt>3</tt><k name="C-o"/> will go back <tt>3</tt> pages)</li> <li>Count support for many commands (<tt>3</tt><k name="C-o"/> will go back <tt>3</tt> pages)</li>