gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-24 14:55:47 +01:00
Code Issues Projects Releases Wiki Activity

Prepare for merge with testing branch.

Browse Source
This commit is contained in:
Kris Maglione
2010-08-28 15:47:45 -04:00
parent 0c6a7b178f
commit 5632e14721
25 changed files with 903 additions and 801 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
common/content/mappings.js
View File

@@ -127,6 +127,13 @@ const Mappings = Module("mappings", {
init: function () {
this._main = []; // default mappings
this._user = []; // user created mappings
dactyl.registerObserver("mode-add", function (mode) {
if (!(mode.mask in this._user || mode.mask in this._main)) {
this._main[mode.mask] = [];
this._user[mode.mask] = [];
}
});
},
_addMap: function (map) {
@@ -189,13 +196,6 @@ const Mappings = Module("mappings", {
*/
getUserIterator: function (mode) this._mappingsIterator(mode, this._user),
addMode: function (mode) {
if (!(mode in this._user || mode in this._main)) {
this._main[mode] = [];
this._user[mode] = [];
}
},
/**
* Adds a new default key mapping.
*
@@ -477,6 +477,17 @@ const Mappings = Module("mappings", {
[mode.disp.toLowerCase()]);
},
completion: function () {
completion.userMapping = function userMapping(context, args, modes) {
// FIXME: have we decided on a 'standard' way to handle this clash? --djk
modes = modes || [modules.modes.NORMAL];
if (args.completeArg == 0) {
let maps = [[m.names[0], ""] for (m in mappings.getUserIterator(modes))];
context.completions = maps;
}
};
},
javascript: function () {
JavaScript.setCompleter(this.get,
[
null,
@@ -489,16 +500,6 @@ const Mappings = Module("mappings", {
]);
}
]);
completion.userMapping = function userMapping(context, args, modes) {
// FIXME: have we decided on a 'standard' way to handle this clash? --djk
modes = modes || [modules.modes.NORMAL];
if (args.completeArg == 0) {
let maps = [[m.names[0], ""] for (m in mappings.getUserIterator(modes))];
context.completions = maps;
}
};
},
modes: function () {
for (let mode in modes) {