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

Add real mappings for most HINT mode keys. Lazily expand leader, and keep in sync with 'mapleader'.

Browse Source 
--HG--
branch : bootstrapped
This commit is contained in:
Kris Maglione
2010-12-28 14:33:57 -05:00
parent 83aa5e4857
commit 9655d741b8
8 changed files with 166 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
common/content/mappings.js
View File

@@ -90,7 +90,9 @@ var Map = Class("Map", {
* @param {string} name The name to query.
* @returns {boolean}
*/
hasName: function (name) this.names.indexOf(name) >= 0,
hasName: function (name) this.keys.indexOf(name) >= 0,
keys: Class.memoize(function () this.names.map(mappings._expandLeader)),
/**
* Execute the action for this mapping.
@@ -102,7 +104,7 @@ var Map = Class("Map", {
* @param {string} argument The normal argument if accepted by this
* mapping. E.g. "a" for "ma"
*/
execute: function (motion, count, argument) {
execute: function (motion, count, argument, command) {
let args = [];
if (this.motion)
@@ -111,6 +113,7 @@ var Map = Class("Map", {
args.push(count);
if (this.arg)
args.push(argument);
args.push(command);
let self = this;
function repeat() self.action.apply(self, args);
@@ -153,10 +156,9 @@ var Mappings = Module("mappings", {
_getMap: function (mode, cmd, stack) {
let maps = stack[mode] || [];
for (let [, map] in Iterator(maps)) {
for (let [, map] in Iterator(maps))
if (map.hasName(cmd))
return map;
}
return null;
},
@@ -233,7 +235,6 @@ var Mappings = Module("mappings", {
* @optional
*/
addUserMap: function (modes, keys, description, action, extra) {
keys = keys.map(this._expandLeader);
extra = extra || {};
extra.user = true;
let map = Map(modes, keys, description, action, extra);
@@ -631,7 +632,16 @@ var Mappings = Module("mappings", {
options: function () {
options.add(["mapleader", "ml"],
"Define the replacement keys for the <Leader> pseudo-key",
"string", "\\");
"string", "\\", {
setter: function (value) {
if (this.hasChanged)
for (let hive in values([mappings._user, mappings._main]))
for (let mode in values(hive))
for (let map in values(mode))
delete map.keys;
return value;
}
});
}
});