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

Update :listkeys for :mapgroups.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-19 14:40:47 -05:00
parent d41b414171
commit 807c7a4aba
5 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
common/content/mappings.js
View File

@@ -289,7 +289,7 @@ var Mappings = Module("mappings", {
iterate: function (mode) {
let seen = {};
for (let hive in this.hives.iterValues())
for (let map in values(hive.getStack(mode)))
for (let map in hive.getStack(mode).iterValues())
if (!set.add(seen, map.name))
yield map;
},
@@ -732,9 +732,22 @@ var Mappings = Module("mappings", {
let args = {
getMode: function (args) findMode(args["-mode"]),
iterate: function (args) {
for (let map in mappings.iterate(this.getMode(args)))
for (let name in values(map.names))
yield { name: name, __proto__: map };
let mainMode = this.getMode(args);
let seen = {};
for (let mode in values([mainMode].concat(mainMode.bases)))
for (let hive in mappings.hives.iterValues())
for (let map in array.iterValues(hive.getStack(mode)))
for (let name in values(map.names))
if (!set.add(seen, name)) {
yield {
name: name,
columns: [
mode == mainMode ? "" : <span highlight="Object" style="padding-right: 1em;">{mode.name}</span>,
hive.name == "builtin" ? "" : <span highlight="Object" style="padding-right: 1em;">{hive.name}</span>,
],
__proto__: map
};
}
},
format: {
description: function (map) (XML.ignoreWhitespace = false, XML.prettyPrinting = false, <>
@@ -744,7 +757,8 @@ var Mappings = Module("mappings", {
{template.linkifyHelp(map.description + (map.rhs ? ": " + map.rhs : ""))}
</>),
help: function (map) let (char = array.compact(map.modes.map(function (m) m.char))[0])
char === "n" ? map.name : char ? char + "_" + map.name : ""
char === "n" ? map.name : char ? char + "_" + map.name : "",
headings: ["Command", "Mode", "Group", "Description"]
}
}

4
common/content/statusline.js
View File

@@ -22,7 +22,7 @@ var StatusLine = Module("statusline", {
#addon-bar > #addonbar-closebutton { visibility: collapse; }
#addon-bar > xul|toolbarspring { visibility: collapse; }
]]></css>);
highlight.loadCSS(String.replace(<![CDATA[
highlight.loadCSS(util.compileMacro(<![CDATA[
!AddonBar;#addon-bar {
padding-left: 0 !important;
min-height: 18px !important;
@@ -36,7 +36,7 @@ var StatusLine = Module("statusline", {
min-width: 0 !important;
}
AddonButton:not(:hover) background: transparent !important;
]]>, "<padding>", util.OS.isMacOSX ? "padding-right: 10px !important;" : ""));
]]>)({ padding: util.OS.isMacOSX ? "padding-right: 10px !important;" : "" }));
}
let _commandline = "if (window.dactyl) return dactyl.modules.commandline";