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

Fix confusing, duplicate help index entries.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-22 03:00:50 -05:00
parent 28ec383432
commit 572f36906b
5 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/content/mappings.js
View File

@@ -661,11 +661,14 @@ var Mappings = Module("mappings", {
let args = {
getMode: function (args) findMode(args["-mode"]),
iterate: function (args) {
let mainMode = this.getMode(args);
iterate: function (args, mainOnly) {
let modes = [this.getMode(args)];
if (!mainOnly)
modes = modes.concat(modes[0].bases);
let seen = {};
// Bloody hell. --Kris
for (let mode in values([mainMode].concat(mainMode.bases)))
for (let [i, mode] in Iterator(modes))
for (let hive in mappings.hives.iterValues())
for (let map in array.iterValues(hive.getStack(mode)))
for (let name in values(map.names))
@@ -673,7 +676,7 @@ var Mappings = Module("mappings", {
yield {
name: name,
columns: [
mode == mainMode ? "" : <span highlight="Object" style="padding-right: 1em;">{mode.name}</span>,
i === 0 ? "" : <span highlight="Object" style="padding-right: 1em;">{mode.name}</span>,
hive == mappings.builtin ? "" : <span highlight="Object" style="padding-right: 1em;">{hive.name}</span>
],
__proto__: map
@@ -711,9 +714,11 @@ var Mappings = Module("mappings", {
__proto__: args,
name: [mode.char + "listk[eys]", mode.char + "lk"],
iterateIndex: function (args)
let (self = this, prefix = mode.char == "n" ? "" : mode.char + "_")
let (self = this, prefix = /^[bCmn]$/.test(mode.char) ? "" : mode.char + "_",
tags = services["dactyl:"].HELP_TAGS)
({ helpTag: prefix + map.name, __proto__: map }
for (map in self.iterate(args))),
for (map in self.iterate(args, true))
if (map.hive === mappings.builtin || set.has(tags, prefix + map.name))),
description: "List all " + mode.name + " mode mappings along with their short descriptions",
index: mode.char + "-map",
getMode: function (args) mode,