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

Frob tests.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-12 15:27:33 -05:00
parent ff2da13c70
commit 8277d4b0c4
5 changed files with 65 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/content/abbreviations.js
View File

@@ -300,7 +300,7 @@ var Abbreviations = Module("abbreviations", {
if (args.bang)
args["-group"].clear(modes);
else if (!args["-group"].remove(modes, lhs))
else if (!args["-group"].remove(modes, args[0]))
return dactyl.echoerr("E24: No such abbreviation");
}, {
argCount: "?",

1
common/content/dactyl.js
View File

@@ -1368,7 +1368,6 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
dactyl.echoerr(template.linkifyHelp(error.message));
else
dactyl.beep();
util.reportError(error);
return;
}
if (error.result == Cr.NS_BINDING_ABORTED)

15
common/content/mappings.js
View File

@@ -352,7 +352,7 @@ var Mappings = Module("mappings", {
* {@link Map#extraInfo}).
* @optional
*/
addUserMap: deprecated("groups.mappings.add", function addUserMap() {
addUserMap: deprecated("group.mappings.add", function addUserMap() {
let map = this.user.add.apply(this.user, arguments);
map.definedAt = contexts.getCaller(Components.stack.caller);
return map;
@@ -387,17 +387,18 @@ var Mappings = Module("mappings", {
* @param {string} filter The filter string to match.
*/
list: function (modes, filter, hives) {
hives = (hives || mappings.userHives).filter(function (h) modes.some(function (m) h.getStack(m).length));
let modeSign = "";
modes.filter(function (m) m.char).forEach(function (m) { modeSign += m.char; });
modes.filter(function (m) !m.char).forEach(function (m) { modeSign += " " + m.name; });
modeSign = modeSign.replace(/^ /, "");
hives = (hives || mappings.userHives).map(function (h) [h, maps(h)])
.filter(function ([h, m]) !filter || m.length);
function maps(hive) {
let maps = hive.iterate(modes);
let maps = iter.toArray(hive.iterate(modes));
if (filter)
maps = [map for (map in maps) if (map.names[0] == filter)];
maps = maps.filter(function (m) m.names[0] === filter);
return maps;
}
@@ -410,9 +411,9 @@ var Mappings = Module("mappings", {
</tr>
<col style="min-width: 6em; padding-right: 1em;"/>
{
template.map(hives, function (hive) let (i = 0)
template.map(hives, function ([hive, maps]) let (i = 0)
<tr style="height: .5ex;"/> +
template.map(maps(hive), function (map)
template.map(maps, function (map)
template.map(map.names, function (name)
<tr>
<td highlight="Title">{!i++ ? hive.name : ""}</td>