From 1586cf7423ba350ea3a3afaa0566afe4521904e9 Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Sun, 8 Mar 2015 12:15:47 +0200 Subject: client: fix up/down being handled both by completer and by type selector when shift pressed --- src/client/view/completer.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'src/client/view/completer.js') diff --git a/src/client/view/completer.js b/src/client/view/completer.js index 19ec636b..f05c40a0 100644 --- a/src/client/view/completer.js +++ b/src/client/view/completer.js @@ -1,10 +1,15 @@ define( -['jquery', 'Bacon', 'util'], -function($, Bacon, util) { +['jquery', 'Bacon', 'util', 'consts'], +function($, Bacon, util, consts) { var value = util.value, selectionStart = util.selectionStart; +// constants +var VK_UP = consts.VK_UP, + VK_DOWN = consts.VK_DOWN, + VK_ESCAPE = consts.VK_ESCAPE; + function quoted__double(string) { // quote string using double quotes return '"' + string + '"'; } @@ -66,16 +71,19 @@ var completer = (function (input_element, dropdown, base_config) { input_element.keyup(function(e) { var ret = undefined; + if (e.shiftKey) { + return ret; + } switch (e.keyCode) { - case 38: //UP + case VK_UP: //UP prev_option(); ret = false; break; - case 40: //DOWN + case VK_DOWN: //DOWN next_option(); ret = false; break; - case 27: // Escape + case VK_ESCAPE: // Escape hide(); ret = false; break; -- cgit v1.3.1