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

fix extra_info processing in Map() and other minor typos

Browse Source
This commit is contained in:
Doug Kearns
2007-05-30 07:22:05 +00:00
parent 2d1c1e3b92
commit 2e116c374e
1 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
chrome/content/vimperator/mappings.js
View File

@@ -1,47 +1,66 @@
// TODO: document // TODO: document
function Map(mode, cmds, act, extra_info) function Map(mode, cmds, act, extra_info)
{ {
if (!mode || (!cmds || !cmds.length) || !action) if (!mode || (!cmds || !cmds.length) || !act)
return null; return null;
if (!extra_info)
extra_info = {};
var action = act; var action = act;
var flags = extra_info.flags || 0;
this.mode = mode; this.mode = mode;
this.commands = cmds; this.commands = cmds;
if (extra_info.usage) if (extra_info)
this.usage = extra_info.usage;
else
{ {
var usage = ""; var flags = extra_info.flags || 0;
if (flags & vimperator.mappings.flags.COUNT)
usage = "{count}";
usage += cmd; if (extra_info.usage)
if (flags & vimperator.mappings.flags.ARGUMENT) this.usage = extra_info.usage;
usage += " {arg}"; else
{
this.usage = "";
if (flags & vimperator.mappings.flags.COUNT)
this.usage = "{count}";
this.usage += this.commands;
if (flags & vimperator.mappings.flags.ARGUMENT)
this.usage += " {arg}";
}
if (extra_info.help)
this.help = extra_info.help;
else
this.help = null;
if (extra_info.short_help)
this.short_help = extra_info.short_help;
else
this.short_help = null;
} }
if (extra_info.help)
this.help = extra_info.help;
if (extra_info.short_help)
this.short_help = extra_info.short_help;
// XXX: can we move this to Map.prototype.execute, or don't we have access to this in a prototype? // XXX: can we move this to Map.prototype.execute, or don't we have access to this in a prototype?
this.execute = function() { this.execute = function()
{
action.call(this); action.call(this);
} }
this.toString = function()
{
// FIXME: -- djk
return "Map {" +
"\nmode: " + this.mode +
"\ncommands: " + this.commands +
"\naction: " + action +
"\nusage: " + this.usage +
"\nshort_help: " + this.short_help +
"\nhelp: " + this.help +
"\n}"
}
} }
function Mappings() function Mappings()
{ {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
////////////////////// PRIVATE SECTION ///////////////////////////////////////// ////////////////////// PRIVATE SECTION /////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
var main = []; // array of default Map() objects var main = []; // array of default Map() objects
var user = []; // array of objects created by :map var user = []; // array of objects created by :map
@@ -72,17 +91,16 @@ function Mappings()
} }
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
////////////////////// PUBLIC SECTION ////////////////////////////////////////// ////////////////////// PUBLIC SECTION //////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
this.flags = { this.flags = {
MOTION: 1 << 0, MOTION: 1 << 0,
COUNT: 1 << 1, COUNT: 1 << 1,
ARGUMENT: 1 << 2 ARGUMENT: 1 << 2
}; };
// add a user mapping
this.add = function(map) this.add = function(map)
{ {
if (!map) if (!map)