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

use code.tag element's text content to anchor the help 'section' location

Browse Source 
rather than code.id
This commit is contained in:
Doug Kearns
2007-06-11 12:51:31 +00:00
parent d4598ed391
commit 397c667443
3 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
chrome/content/vimperator/completion.js
View File

@@ -253,7 +253,8 @@ function get_file_completions(filter)/*{{{*/
function get_help_completions(filter)/*{{{*/
{
var help_array = [[["mappings"], "Normal mode commands"],
var help_array = [[["introduction"], "Introductory text"],
[["mappings"], "Normal mode commands"],
[["commands"], "Ex commands"],
[["options"], "Configuration options"]]; // TODO: hardcoded until we have proper 'pages'
g_substrings = [];

12
chrome/content/vimperator/default.css
View File

@@ -48,7 +48,7 @@ hr { /* horizontal lines */
/*border-color: #6A97D4;*/
border-color: white;
}
td.tag {
td.taglist {
text-align: right;
vertical-align: top;
/* white-space: -moz-pre-wrap !important; // DJK */
@@ -56,20 +56,22 @@ td.tag {
border-width: 0px 10px 0px 10px;
border-color: blue !important;
}
td.tag td {
td.taglist td {
width: 100px;
padding: 3px 0px 3px 0px;
}
tr.tag code, td.usage code {
tr.taglist code, td.usage code {
margin: 0px 2px;
}
td.usage code {
white-space: nowrap;
}
td.tag code {
td.taglist code {
margin-left: 2em;
}
code.tag {
font-weight: bold;
color: rgb(255, 0, 255); /* magenta */
margin-left: 2em;
}
tr.description {
margin-bottom: 4px;

24
chrome/content/vimperator/help.js
View File

@@ -90,7 +90,7 @@ function help(section, easter)
else
ret += "Sorry, no help available";
// the tags which are printed on the top right
ret += '</td><td class="tag" valign="top">';
ret += '</td><td class="taglist" valign="top">';
var names = commands[i][COMMANDS];
for (var j=0; j < names.length; j++)
{
@@ -100,7 +100,7 @@ function help(section, easter)
// cmd_name = cmd_name.replace(/"/g, "&quot;");
// cmd_name = cmd_name.replace(/'/g, "&apos;");
// cmd_name = cmd_name.replace(/&/g, "&amp;");
ret += '<code id="' +beg+ /*commands[i][COMMANDS][j]*/ cmd_name +end+ '">' +beg+ cmd_name +end+ '</code><br/>';
ret += '<code class="tag">' +beg+ cmd_name +end+ '</code><br/>';
}
ret += '</td></tr>';
@@ -137,7 +137,7 @@ function help(section, easter)
'<p class="tagline">First there was a Navigator, then there was an Explorer.\n' +
'Later it was time for a Konqueror. Now it\'s time for an Imperator, the VIMperator :)</p>\n';
var introduction = '<div><h2 id="introduction">Introduction</h2></div>' +
var introduction = '<span style="float: right"><code class="tag">introduction</code></span><h2 id="introduction">Introduction</h2>' +
'<p><a href="http://vimperator.mozdev.org">Vimperator</a> is a free browser add-on for Firefox, which makes it look and behave like the <a href="http://www.vim.org">Vim</a> text editor. ' +
'It has similar key bindings, and you could call it a modal web browser, as key bindings differ according to which mode you are in.</p>\n' +
@@ -161,7 +161,7 @@ function help(section, easter)
'<p>Of course as a believer in free open source software, only make a donation if you really like Vimperator, and the money doesn\'t hurt - otherwise just use it, recommend it and like it :)</p>\n'
var mappings = '<div><h2 id="mappings">Mappings</h2></div>\n' +
var mappings = '<span style="float: right"><code class="tag">mappings</code></span><h2 id="mappings">Mappings</h2>\n' +
'<p>The denotion of modifier keys is like in Vim, so C- means the Control key, M- the Meta key, A- the Alt key and S- the Shift key.</p>'+
'<table class="vimperator mappings">'
// FIXME: fix this when Command() is added and help patch is merged -- djk
@@ -173,7 +173,7 @@ function help(section, easter)
if (section && section == 'holy-grail')
mappings += '<span id="holy-grail">You found it, Arthur!</span>\n';
var commands = '<div><h2 id="commands">Commands</h2></div>\n' +
var commands = '<span style="float: right"><code class="tag">commands</code></span><h2 id="commands">Commands</h2>\n' +
'<table class="vimperator commands">\n';
var all_commands = [];
for (var command in vimperator.commands)
@@ -186,7 +186,7 @@ function help(section, easter)
'now dead, unfortunately. So now you might wonder what the meaning of death<br/>' +
'is...</p>\n';
var options = '<div><h2 id="options">Options</h2></div>\n' +
var options = '<span style="float: right"><code class="tag">options</code></span><h2 id="options">Options</h2>\n' +
'<table class="vimperator options">\n';
options += makeHelpString(g_options, "'", "'", makeOptionsHelpString);
options += '</table>';
@@ -245,15 +245,21 @@ function help(section, easter)
if (section)
{
var element = doc.getElementById(section);
function findSectionElement(section)
{
return evaluateXPath('//code[@class="tag" and text()="' + section + '"]')
.snapshotItem(0);
}
element = findSectionElement(section);
if (!element)
{
var firstChar = section.charAt(0);
if (firstChar != ':' && firstChar != "'")
{
element = doc.getElementById(':' + section);
element = findSectionElement(':' + section);
if (!element)
element = doc.getElementById("'" + section + "'");
element = findSectionElement("'" + section + "'");
}
}
if (!element)