From a2cca9118e7d87cb44fd4efffb7869a1f9fa2698 Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Wed, 24 Nov 2010 15:56:52 +0000
Subject: [PATCH] make keybindings use the canon

---
 lib/ace/keybinding.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/ace/keybinding.js b/lib/ace/keybinding.js
index 78212755..31df2ee3 100644
--- a/lib/ace/keybinding.js
+++ b/lib/ace/keybinding.js
@@ -41,7 +41,7 @@ var core = require("pilot/core").core;
 var event = require("pilot/event").event;
 var default_mac = require("ace/conf/keybindings/default_mac").bindings;
 var default_win = require("ace/conf/keybindings/default_win").bindings;
-var PluginManager = require("pilot/plugin_manager").PluginManager;
+var canon = require("pilot/canon");
 require("ace/commands/default_commands");
 
 var KeyBinding = function(element, editor, config) {
@@ -55,11 +55,9 @@ var KeyBinding = function(element, editor, config) {
 
         var commandName = (_self.config.reverse[hashId] || {})[(key
             || String.fromCharCode(e.keyCode)).toLowerCase()];
-        var command = PluginManager.commands[commandName];
 
-        if (command) {
-            var env = { editor: editor, selection: editor.getSelection() };
-            command(env);
+        var success = canon.exec(commandName);
+        if (success) {
             return event.stopEvent(e);
         }
     });