mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2025-12-30 14:42:26 +01:00
massive options.js cleanup. It is now only responsible for the options framework, but does not host
any option. They are now saved in the modules where the corresponding features are defined or in vim.js if they are general options. Expect the same code rework for commands and mappings.
This commit is contained in:
@@ -1061,8 +1061,11 @@ vimperator.Events = function () //{{{
|
||||
tmp.execute(null, vimperator.input.count, key);
|
||||
}
|
||||
}
|
||||
// only follow a map if there isn't a longer possible mapping (allows you to do :map yy, when y is a mapping)
|
||||
else if (map && !skipMap && vimperator.mappings.getCandidates(vimperator.mode, candidateCommand).length == 0)
|
||||
// only follow a map if there isn't a longer possible mapping
|
||||
// (allows you to do :map z yy, when zz is a longer mapping than z)
|
||||
// TODO: map.rhs is only defined for user defined commands, should add a "isDefault" property
|
||||
else if (map && !skipMap && (map.rhs ||
|
||||
vimperator.mappings.getCandidates(vimperator.mode, candidateCommand).length == 0))
|
||||
{
|
||||
vimperator.input.count = parseInt(countStr, 10);
|
||||
if (isNaN(vimperator.input.count))
|
||||
@@ -1161,6 +1164,7 @@ vimperator.Events = function () //{{{
|
||||
return false;
|
||||
},
|
||||
|
||||
// TODO: move to buffer.js?
|
||||
progressListener: {
|
||||
QueryInterface: function (aIID)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user