diff options
| author | Kris Maglione <maglione.k@gmail.com> | 2011-02-19 07:52:01 -0500 |
|---|---|---|
| committer | Kris Maglione <maglione.k@gmail.com> | 2011-02-19 07:52:01 -0500 |
| commit | 5a519b2f9c52fc7e8303b338582624fc5f71ebec (patch) | |
| tree | b57ea8d12046b3a3e5f573e9963dca0cf3d517a2 | |
| parent | 2cef435dbcec4379896fea7a94f06da7ad6d8bab (diff) | |
| download | pentadactyl-5a519b2f9c52fc7e8303b338582624fc5f71ebec.tar.gz | |
Fix closing menus on <Esc> broken in revision bf712a2498ed.
| -rw-r--r-- | common/content/editor.js | 6 | ||||
| -rw-r--r-- | common/content/modes.js | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/common/content/editor.js b/common/content/editor.js index 9bf016ee..8a692da9 100644 --- a/common/content/editor.js +++ b/common/content/editor.js @@ -844,19 +844,19 @@ var Editor = Module("editor", { [[modes.AUTOCOMPLETE]].concat(Array.slice(arguments))) bind(["<Esc>"], "Return to INSERT mode", - function () Events.PASS); + function () Events.PASS_THROUGH); bind(["<C-[>"], "Return to INSERT mode", function () { events.feedkeys("<Esc>", { skipmap: true }); }); bind(["<Up>"], "Select the previous autocomplete result", - function () Events.PASS); + function () Events.PASS_THROUGH); bind(["<C-p>"], "Select the previous autocomplete result", function () { events.feedkeys("<Up>", { skipmap: true }); }); bind(["<Down>"], "Select the next autocomplete result", - function () Events.PASS); + function () Events.PASS_THROUGH); bind(["<C-n>"], "Select the next autocomplete result", function () { events.feedkeys("<Down>", { skipmap: true }); }); diff --git a/common/content/modes.js b/common/content/modes.js index 6c302a18..0c7aa62b 100644 --- a/common/content/modes.js +++ b/common/content/modes.js @@ -522,7 +522,10 @@ var Modes = Module("modes", { mappings.add([modes.MENU], ["<Esc>"], "Close the current popup", - function () Events.PASS); + function () { + modes.pop(); + return Events.PASS_THROUGH; + }); mappings.add([modes.MENU], ["<C-[>"], "Close the current popup", |