Updated Branches: refs/heads/4.2 3c58f9bb9 -> f09afea06
CLOUDSTACK-4434: EN: Ubuntu: Direct input "- _ ", "? /", "keyboard /" ,"keyboard -" keys are not working well for the US keyboard. Reviewed-by: Fang Wang <[email protected]> Signed-off-by: Vijayendra Bhamidipati <[email protected]> (cherry picked from commit f2874d0f228680b0dcd3299bb070215a2648a4a8) Signed-off-by: animesh <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0fc996c2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0fc996c2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0fc996c2 Branch: refs/heads/4.2 Commit: 0fc996c20f74d935833e1a2df48f4477dd9babfc Parents: 3c58f9b Author: Sanjay Tripathi <[email protected]> Authored: Wed Aug 28 14:22:21 2013 +0530 Committer: animesh <[email protected]> Committed: Tue Sep 3 15:56:45 2013 -0700 ---------------------------------------------------------------------- services/console-proxy/server/js/ajaxviewer.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0fc996c2/services/console-proxy/server/js/ajaxviewer.js ---------------------------------------------------------------------- diff --git a/services/console-proxy/server/js/ajaxviewer.js b/services/console-proxy/server/js/ajaxviewer.js index d3f3aa9..9643204 100644 --- a/services/console-proxy/server/js/ajaxviewer.js +++ b/services/console-proxy/server/js/ajaxviewer.js @@ -140,9 +140,13 @@ KeyboardMapper.prototype = { this.jsX11KeysymMap[AjaxViewer.JS_KEY_SELECT_KEY] = AjaxViewer.X11_KEY_SELECT_KEY; this.jsX11KeysymMap[AjaxViewer.JS_KEY_DECIMAL_POINT] = AjaxViewer.X11_KEY_DECIMAL_POINT; this.jsKeyPressX11KeysymMap[45] = [{type: AjaxViewer.KEY_DOWN, code: AjaxViewer.X11_KEY_SUBSTRACT, modifiers: 0, shift: true }, - {type: AjaxViewer.KEY_DOWN, code: AjaxViewer.X11_KEY_SUBSTRACT, modifiers: 0, shift: false }]; + {type: AjaxViewer.KEY_UP, code: AjaxViewer.X11_KEY_SUBSTRACT, modifiers: 0, shift: true }, + {type: AjaxViewer.KEY_DOWN, code: AjaxViewer.X11_KEY_SUBSTRACT, modifiers: 0, shift: false }, + {type: AjaxViewer.KEY_UP, code: AjaxViewer.X11_KEY_SUBSTRACT, modifiers: 0, shift: false }]; this.jsKeyPressX11KeysymMap[47] = [{type: AjaxViewer.KEY_DOWN, code: 0x2f, modifiers: 0, shift: true }, - {type: AjaxViewer.KEY_DOWN, code: 0x2f, modifiers: 0, shift: false }]; + {type: AjaxViewer.KEY_UP, code: 0x2f, modifiers: 0, shift: true }, + {type: AjaxViewer.KEY_DOWN, code: 0x2f, modifiers: 0, shift: false }, + {type: AjaxViewer.KEY_UP, code: 0x2f, modifiers: 0, shift: false }]; } }, RawkeyboardInputHandler : function(eventType, code, modifiers, guestos, browser, browserVersion) {
