You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by de...@apache.org on 2013/07/30 14:28:15 UTC
[1/2] git commit: updated refs/heads/4.2 to 7cb1c6f
Updated Branches:
refs/heads/4.2 f0db7aec9 -> 7cb1c6fa7
CLOUDSTACK-1961: Common issues found in English OS with EN-US standard Keyboard.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e45888df
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e45888df
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e45888df
Branch: refs/heads/4.2
Commit: e45888df961890af476f0f9f9b6d1c91c26cbbb6
Parents: f0db7ae
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Mon Jul 29 18:29:43 2013 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Tue Jul 30 17:40:17 2013 +0530
----------------------------------------------------------------------
services/console-proxy/server/js/ajaxviewer.js | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e45888df/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 a6e1eda..d3f3aa9 100644
--- a/services/console-proxy/server/js/ajaxviewer.js
+++ b/services/console-proxy/server/js/ajaxviewer.js
@@ -137,6 +137,12 @@ KeyboardMapper.prototype = {
this.jsX11KeysymMap[AjaxViewer.JS_KEY_SHIFT] = AjaxViewer.X11_KEY_SHIFT;
this.jsX11KeysymMap[AjaxViewer.JS_KEY_CTRL] = AjaxViewer.X11_KEY_CTRL;
this.jsX11KeysymMap[AjaxViewer.JS_KEY_ALT] = AjaxViewer.X11_KEY_ALT;
+ 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 }];
+ this.jsKeyPressX11KeysymMap[47] = [{type: AjaxViewer.KEY_DOWN, code: 0x2f, modifiers: 0, shift: true },
+ {type: AjaxViewer.KEY_DOWN, code: 0x2f, modifiers: 0, shift: false }];
}
},
RawkeyboardInputHandler : function(eventType, code, modifiers, guestos, browser, browserVersion) {
@@ -506,6 +512,7 @@ AjaxViewer.X11_KEY_F12 = 0xffc9;
AjaxViewer.X11_KEY_SHIFT = 0xffe1;
AjaxViewer.X11_KEY_CTRL = 0xffe3;
AjaxViewer.X11_KEY_ALT = 0xffe9;
+AjaxViewer.X11_KEY_SELECT_KEY = 0xff67;
AjaxViewer.X11_KEY_GRAVE_ACCENT = 0x60;
AjaxViewer.X11_KEY_SUBSTRACT = 0x2d;
AjaxViewer.X11_KEY_ADD = 0x2b;
[2/2] git commit: updated refs/heads/4.2 to 7cb1c6f
Posted by de...@apache.org.
CLOUDSTACK-2909: patch to fix TAB in US keyboard.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7cb1c6fa
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7cb1c6fa
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7cb1c6fa
Branch: refs/heads/4.2
Commit: 7cb1c6fa7ba229484ec3e87ad5f50b35eeacf953
Parents: e45888d
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Tue Jul 30 14:13:30 2013 +0530
Committer: Devdeep Singh <de...@gmail.com>
Committed: Tue Jul 30 17:41:05 2013 +0530
----------------------------------------------------------------------
services/console-proxy/server/js/ajaxkeys.js | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7cb1c6fa/services/console-proxy/server/js/ajaxkeys.js
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/js/ajaxkeys.js b/services/console-proxy/server/js/ajaxkeys.js
index 725c8c5..4e4d775 100644
--- a/services/console-proxy/server/js/ajaxkeys.js
+++ b/services/console-proxy/server/js/ajaxkeys.js
@@ -172,7 +172,6 @@ var keyboardTables = [
{X11: [ {keycode: 222, entry: X11_KEY_CIRCUMFLEX_ACCENT},
{keycode: 220, entry: X11_KEY_YEN_MARK},
{keycode: 186, entry: X11_KEY_COLON, browser: "Chrome"},
- {keycode: 9, entry: 9, guestos: "XenServer"},
{keycode: 226, entry: X11_KEY_REVERSE_SOLIUS},
{keycode: 240, entry: [