diff options
| author | Stephen Blott | 2016-03-05 08:32:58 +0000 |
|---|---|---|
| committer | Stephen Blott | 2016-03-05 08:32:58 +0000 |
| commit | fbf7791894cb2708774e8870f623a8211e3a0790 (patch) | |
| tree | 7c13bc86eb8e658f9cbad5e3aad59173be81ec0c | |
| parent | 62359adda7bc38917de38e3fc794d37817fa05ed (diff) | |
| download | vimium-fbf7791894cb2708774e8870f623a8211e3a0790.tar.bz2 | |
Simplify command-registry generation.
If we just use the name `background` instead of `isBackgroundCommand`,
then we can simplify the building of registry entries.
This is preparitory to adding a new registryEntry field: topFrame;
initially just for the Vomnibar, but thereafter for other UI components.
| -rw-r--r-- | background_scripts/commands.coffee | 7 | ||||
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/background_scripts/commands.coffee b/background_scripts/commands.coffee index 7429b6f0..c13a09ba 100644 --- a/background_scripts/commands.coffee +++ b/background_scripts/commands.coffee @@ -24,12 +24,7 @@ Commands = return options ||= {} - @availableCommands[command] = - description: description - isBackgroundCommand: options.background - passCountToFunction: options.passCountToFunction - noRepeat: options.noRepeat - repeatLimit: options.repeatLimit + @availableCommands[command] = extend options, description: description mapKeyToCommand: ({ key, command, options }) -> unless @availableCommands[command] diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index 0ae3d229..71535b19 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -120,7 +120,7 @@ class NormalMode extends KeyHandlerMode if registryEntry.command.startsWith "Vomnibar." chrome.runtime.sendMessage handler: "sendMessageToFrames", message: {name: "openVomnibar", sourceFrameId: frameId, registryEntry} - else if registryEntry.isBackgroundCommand + else if registryEntry.background chrome.runtime.sendMessage {handler: "runBackgroundCommand", frameId, registryEntry, count} else if registryEntry.passCountToFunction Utils.invokeCommandString registryEntry.command, [count] |